Staging freeze

Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

The last staging branch was merged into the master branch on December
11.

According to the 3 week staging cycle we are trying to adhere to [0],
this would mean we freeze the current branch on December 25 and try to
merge it on January 1.

These dates are inconvenient for many people. I propose we freeze the
branch and start building on December 27, and try to merge on January 3.

[0]
http://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 855 bytes --]

On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
     The last staging branch was merged into the master branch on December
     11.
     
     According to the 3 week staging cycle we are trying to adhere to [0],
     this would mean we freeze the current branch on December 25 and try to
     merge it on January 1.
     
     These dates are inconvenient for many people. I propose we freeze the
     branch and start building on December 27, and try to merge on January 3.
     
     [0]
     http://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html


Sounds good to me.

J'



-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

On Fri, Dec 23, 2016 at 07:00:38AM +0100, John Darrington wrote:
> On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
>      The last staging branch was merged into the master branch on December
>      11.
>      
>      According to the 3 week staging cycle we are trying to adhere to [0],
>      this would mean we freeze the current branch on December 25 and try to
>      merge it on January 1.
>      
>      These dates are inconvenient for many people. I propose we freeze the
>      branch and start building on December 27, and try to merge on January 3.
>      
>      [0]
>      http://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html
> 
> 
> Sounds good to me.

I'll start the evaluation of the staging branch in ~12 hours.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
> The last staging branch was merged into the master branch on December
> 11.
> 
> According to the 3 week staging cycle we are trying to adhere to [0],
> this would mean we freeze the current branch on December 25 and try to
> merge it on January 1.
> 
> These dates are inconvenient for many people. I propose we freeze the
> branch and start building on December 27, and try to merge on January 3.

And the build failures are rolling in :)

https://hydra.gnu.org/eval/109410?full=1&compare=master#tabs-now-fail

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

On Tue, Dec 27, 2016 at 06:56:44PM -0500, Leo Famulari wrote:
> On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
> > The last staging branch was merged into the master branch on December
> > 11.
> > 
> > According to the 3 week staging cycle we are trying to adhere to [0],
> > this would mean we freeze the current branch on December 25 and try to
> > merge it on January 1.
> > 
> > These dates are inconvenient for many people. I propose we freeze the
> > branch and start building on December 27, and try to merge on January 3.
> 
> And the build failures are rolling in :)
> 
> https://hydra.gnu.org/eval/109410?full=1&compare=master#tabs-now-fail

The 'qemu-image' build failed due to a lack of disk space, presumably on
the VM image file:

------
registering closures...
error: setting journal mode: database or disk is full
ERROR: In procedure scm-error:
ERROR: failed to register store items "/xchg/system"
------
https://hydra.gnu.org/build/1741220

Any advice? I'm not sure where to start looking in the code.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]

On Tue, Dec 27, 2016 at 11:13:05PM -0500, Leo Famulari wrote:
     On Tue, Dec 27, 2016 at 06:56:44PM -0500, Leo Famulari wrote:
     > On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
     > > The last staging branch was merged into the master branch on December
     > > 11.
     > > 
     > > According to the 3 week staging cycle we are trying to adhere to [0],
     > > this would mean we freeze the current branch on December 25 and try to
     > > merge it on January 1.
     > > 
     > > These dates are inconvenient for many people. I propose we freeze the
     > > branch and start building on December 27, and try to merge on January 3.
     > 
     > And the build failures are rolling in :)
     > 
     > https://hydra.gnu.org/eval/109410?full=1&compare=master#tabs-now-fail
     
     The 'qemu-image' build failed due to a lack of disk space, presumably on
     the VM image file:
     
     ------
     registering closures...
     error: setting journal mode: database or disk is full
     ERROR: In procedure scm-error:
     ERROR: failed to register store items "/xchg/system"
     ------
     https://hydra.gnu.org/build/1741220
     
     Any advice? I'm not sure where to start looking in the code.

For what it's worth, I find that building *anything* related to qemu fails
for different reasons in about 2/3 attempts. So I think there is a 
fundamental, yet to be diagnosed problem.

Would it be worth restarting the build and crossing fingers?

J'



-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1869 bytes --]

On Wed, Dec 28, 2016 at 10:17:31AM +0100, John Darrington wrote:
> On Tue, Dec 27, 2016 at 11:13:05PM -0500, Leo Famulari wrote:
>      On Tue, Dec 27, 2016 at 06:56:44PM -0500, Leo Famulari wrote:
>      > On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
>      > > The last staging branch was merged into the master branch on December
>      > > 11.
>      > > 
>      > > According to the 3 week staging cycle we are trying to adhere to [0],
>      > > this would mean we freeze the current branch on December 25 and try to
>      > > merge it on January 1.
>      > > 
>      > > These dates are inconvenient for many people. I propose we freeze the
>      > > branch and start building on December 27, and try to merge on January 3.
>      > 
>      > And the build failures are rolling in :)
>      > 
>      > https://hydra.gnu.org/eval/109410?full=1&compare=master#tabs-now-fail
>      
>      The 'qemu-image' build failed due to a lack of disk space, presumably on
>      the VM image file:
>      
>      ------
>      registering closures...
>      error: setting journal mode: database or disk is full
>      ERROR: In procedure scm-error:
>      ERROR: failed to register store items "/xchg/system"
>      ------
>      https://hydra.gnu.org/build/1741220
>      
>      Any advice? I'm not sure where to start looking in the code.
> 
> For what it's worth, I find that building *anything* related to qemu fails
> for different reasons in about 2/3 attempts. So I think there is a 
> fundamental, yet to be diagnosed problem.

I've seen this error before when I fail to create a large enough blank
QEMU image. I think that's the problem here, but I'm not sure where this
qemu-image derivation comes from in the Guix code base, so I'm not sure
what to try adjusting or even how to replicate the failure.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[Ludovic Courtès]

Hi!

John Darrington <john@darrington.wattle.id.au> skribis:

> For what it's worth, I find that building *anything* related to qemu fails
> for different reasons in about 2/3 attempts. So I think there is a 
> fundamental, yet to be diagnosed problem.

Yet to be diagnosed… and yet to be reported?  :-)

This ‘qemu-image’ job has been failing since Dec. 11, apparently because
the closure of the OS in build-aux/hydra/demo-os.scm has become more
than 1.4G (the size specified in build-aux/hydra/gnu-system.scm):

  https://hydra.gnu.org/job/gnu/master/qemu-image.x86_64-linux

I’m tempted to simply remove this job because it doesn’t buy us anything
compared to the system tests.

Objections?

Ludo’.

Re: Staging freeze

[Leo Famulari]

On Thu, Dec 29, 2016 at 06:51:46PM +0100, Ludovic Courtès wrote:
> Hi!
> 
> John Darrington <john@darrington.wattle.id.au> skribis:
> 
> > For what it's worth, I find that building *anything* related to qemu fails
> > for different reasons in about 2/3 attempts. So I think there is a 
> > fundamental, yet to be diagnosed problem.
> 
> Yet to be diagnosed… and yet to be reported?  :-)
> 
> This ‘qemu-image’ job has been failing since Dec. 11, apparently because
> the closure of the OS in build-aux/hydra/demo-os.scm has become more
> than 1.4G (the size specified in build-aux/hydra/gnu-system.scm):
> 
>   https://hydra.gnu.org/job/gnu/master/qemu-image.x86_64-linux
> 
> I’m tempted to simply remove this job because it doesn’t buy us anything
> compared to the system tests.

Okay!

> Objections?

None here :)

Re: Staging freeze

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Thu, Dec 29, 2016 at 06:51:46PM +0100, Ludovic Courtès wrote:
>> Hi!
>> 
>> John Darrington <john@darrington.wattle.id.au> skribis:
>> 
>> > For what it's worth, I find that building *anything* related to qemu fails
>> > for different reasons in about 2/3 attempts. So I think there is a 
>> > fundamental, yet to be diagnosed problem.
>> 
>> Yet to be diagnosed… and yet to be reported?  :-)
>> 
>> This ‘qemu-image’ job has been failing since Dec. 11, apparently because
>> the closure of the OS in build-aux/hydra/demo-os.scm has become more
>> than 1.4G (the size specified in build-aux/hydra/gnu-system.scm):
>> 
>>   https://hydra.gnu.org/job/gnu/master/qemu-image.x86_64-linux
>> 
>> I’m tempted to simply remove this job because it doesn’t buy us anything
>> compared to the system tests.
>
> Okay!
>
>> Objections?
>
> None here :)

Done in a3a27745013f3e5a287de3bf0187b2f72beb6965.

Ludo’.

Re: Staging freeze

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
> The last staging branch was merged into the master branch on December
> 11.
> 
> According to the 3 week staging cycle we are trying to adhere to [0],
> this would mean we freeze the current branch on December 25 and try to
> merge it on January 1.
> 
> These dates are inconvenient for many people. I propose we freeze the
> branch and start building on December 27, and try to merge on January 3.

Update:

We are having some issues with the armhf and mips64el build machines
that are keeping us from building all the packages.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Staging freeze

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Fri, Dec 23, 2016 at 12:23:39AM -0500, Leo Famulari wrote:
>> The last staging branch was merged into the master branch on December
>> 11.
>> 
>> According to the 3 week staging cycle we are trying to adhere to [0],
>> this would mean we freeze the current branch on December 25 and try to
>> merge it on January 1.
>> 
>> These dates are inconvenient for many people. I propose we freeze the
>> branch and start building on December 27, and try to merge on January 3.
>
> Update:
>
> We are having some issues with the armhf and mips64el build machines
> that are keeping us from building all the packages.

That should be more or less solved.

I’ve just merged ‘master’ into ‘staging’ and started a new evaluation.

Ludo’.

Let’s fix build failures on ‘staging’!

[Ludovic Courtès]

Hello Guix!

Looking at
<https://hydra.gnu.org/eval/109427?compare=master#tabs-now-fail> we have
a few new failures:

  • Ardour fails its ‘configure’ phase
    https://hydra.gnu.org/build/1749839

  • there’s 1 tests failure in python2-pygpgme (breaks many things)
    https://hydra.gnu.org/build/1752661

  • kcrash fails to run its test with Xvfb (breaks all of KDE)
    https://hydra.gnu.org/build/1750201

  • NSS test failure on ARM (breaks many things)
    https://hydra.gnu.org/build/1749670

  • python2-pillow test failures on ARM
    https://hydra.gnu.org/build/1751907

  • ENOSPC on mips64el
    https://hydra.gnu.org/build/1742430

Let’s fix those!

Ludo’.

Fix python-pygpgme FTBFS [was Re: Let’s fix build failures on ‘staging’!]

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 395 bytes --]

On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
>   • there’s 1 tests failure in python2-pygpgme (breaks many things)
>     https://hydra.gnu.org/build/1752661

I attached a patch that takes a patch from Debian to fix the test
failure. But I'm not sure if anything else is still broken in pygpgme.

Also, AFAICT, only 'alot' uses python2-pygpgme. What else breaks?

[-- Attachment #1.2: 0001-gnu-python-pygpgme-Fix-build-failure.patch --]
[-- Type: text/plain, Size: 5478 bytes --]

From 706934ec0765fa3adbf71d84a27cadfdd1c892b3 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sat, 7 Jan 2017 12:11:45 -0500
Subject: [PATCH] gnu: python-pygpgme: Fix build failure.

* gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gnupg.scm (python-pygpgme, python2-pygpgme)[source]: Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/gnupg.scm                             |  3 +-
 .../python-pygpgme-fix-pinentry-tests.patch        | 69 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index edd3d4be7..5fe14e63e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -827,6 +827,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-paste-remove-website-test.patch	\
   %D%/packages/patches/python-paste-remove-timing-test.patch	\
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+  %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch	\
   %D%/packages/patches/qt4-ldflags.patch			\
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
   %D%/packages/patches/rapicorn-isnan.patch			\
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 56fba45e3..92726ca11 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -425,7 +425,8 @@ distributed separately.")
        ;; Unfortunately, we have to disable some tests due to some gpg-agent
        ;; goofiness... see:
        ;;   https://bugs.launchpad.net/pygpgme/+bug/999949
-       (patches (search-patches "pygpgme-disable-problematic-tests.patch"))))
+       (patches (search-patches "pygpgme-disable-problematic-tests.patch"
+                                "python-pygpgme-fix-pinentry-tests.patch"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch b/gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch
new file mode 100644
index 000000000..1f7a4cadb
--- /dev/null
+++ b/gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch
@@ -0,0 +1,69 @@
+Fix test failure of test_XXX caused by upgrade of gpgme from 1.6.0 to
+1.8.0:
+
+======================================================================
+FAIL: test_encrypt_to_signonly (tests.test_encrypt_decrypt.EncryptDecryptTestCase)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/tmp/guix-build-python2-pygpgme-0.3.drv-0/pygpgme-0.3/tests/test_encrypt_decrypt.py", line 185, in test_encrypt_to_signonly
+    self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_UNKNOWN)
+AssertionError: 7 != 0
+
+----------------------------------------------------------------------
+
+Patch copied from the Debian package pygpgme-0.3-1.2:
+
+https://sources.debian.net/src/pygpgme/0.3-1.2/debian/patches/0005-Fix-test-failures-with-pinentry.patch/
+
+From: "Dr. Tobias Quathamer" <toddy@debian.org>
+Date: Thu, 24 Nov 2016 12:20:54 +0100
+Subject: Fix test failures with pinentry
+
+---
+ tests/test_encrypt_decrypt.py | 5 +++--
+ tests/test_passphrase.py      | 2 ++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_encrypt_decrypt.py b/tests/test_encrypt_decrypt.py
+index 21ae83e..05707e1 100644
+--- a/tests/test_encrypt_decrypt.py
++++ b/tests/test_encrypt_decrypt.py
+@@ -132,6 +132,7 @@ class EncryptDecryptTestCase(GpgHomeTestCase):
+             os.write(fd, b'Symmetric passphrase\n')
+         ctx = gpgme.Context()
+         ctx.armor = True
++        ctx.pinentry_mode = gpgme.PINENTRY_MODE_LOOPBACK
+         ctx.passphrase_cb = passphrase
+         ctx.encrypt(None, 0, plaintext, ciphertext)
+         self.assertTrue(
+@@ -182,8 +183,8 @@ class EncryptDecryptTestCase(GpgHomeTestCase):
+             ctx.encrypt([recipient], gpgme.ENCRYPT_ALWAYS_TRUST,
+                         plaintext, ciphertext)
+         except gpgme.GpgmeError as exc:
+-            self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_UNKNOWN)
+-            self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
++            self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME)
++            self.assertEqual(exc.args[1], gpgme.ERR_UNUSABLE_PUBKEY)
+         else:
+             self.fail('gpgme.GpgmeError not raised')
+ 
+diff --git a/tests/test_passphrase.py b/tests/test_passphrase.py
+index 35b3c59..05e6811 100644
+--- a/tests/test_passphrase.py
++++ b/tests/test_passphrase.py
+@@ -34,6 +34,7 @@ class PassphraseTestCase(GpgHomeTestCase):
+         ctx = gpgme.Context()
+         key = ctx.get_key('EFB052B4230BBBC51914BCBB54DCBBC8DBFB9EB3')
+         ctx.signers = [key]
++        ctx.pinentry_mode = gpgme.PINENTRY_MODE_LOOPBACK
+         plaintext = BytesIO(b'Hello World\n')
+         signature = BytesIO()
+ 
+@@ -55,6 +56,7 @@ class PassphraseTestCase(GpgHomeTestCase):
+         ctx = gpgme.Context()
+         key = ctx.get_key('EFB052B4230BBBC51914BCBB54DCBBC8DBFB9EB3')
+         ctx.signers = [key]
++        ctx.pinentry_mode = gpgme.PINENTRY_MODE_LOOPBACK
+         ctx.passphrase_cb = self.passphrase_cb
+         plaintext = BytesIO(b'Hello World\n')
+         signature = BytesIO()
-- 
2.11.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Fix python-pygpgme FTBFS [was Re: Let’s fix build failures on ‘staging’!]

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
>>   • there’s 1 tests failure in python2-pygpgme (breaks many things)
>>     https://hydra.gnu.org/build/1752661
>
> I attached a patch that takes a patch from Debian to fix the test
> failure. But I'm not sure if anything else is still broken in pygpgme.

Woow, that was fast!

> Also, AFAICT, only 'alot' uses python2-pygpgme. What else breaks?

Nothing in fact (“alot” and “many things” are kinda synonymous? ;-)).

> From 706934ec0765fa3adbf71d84a27cadfdd1c892b3 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Sat, 7 Jan 2017 12:11:45 -0500
> Subject: [PATCH] gnu: python-pygpgme: Fix build failure.
>
> * gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/gnupg.scm (python-pygpgme, python2-pygpgme)[source]: Use it.

LGTM, thank you!

Ludo’.

Re: Fix python-pygpgme FTBFS [was Re: Let’s fix build failures on ‘staging’!]

[Leo Famulari]

On Sat, Jan 07, 2017 at 10:31:31PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
> >>   • there’s 1 tests failure in python2-pygpgme (breaks many things)
> >>     https://hydra.gnu.org/build/1752661
> >
> > I attached a patch that takes a patch from Debian to fix the test
> > failure. But I'm not sure if anything else is still broken in pygpgme.
> 
> Woow, that was fast!
> 
> > Also, AFAICT, only 'alot' uses python2-pygpgme. What else breaks?
> 
> Nothing in fact (“alot” and “many things” are kinda synonymous? ;-)).

;)

> > From 706934ec0765fa3adbf71d84a27cadfdd1c892b3 Mon Sep 17 00:00:00 2001
> > From: Leo Famulari <leo@famulari.name>
> > Date: Sat, 7 Jan 2017 12:11:45 -0500
> > Subject: [PATCH] gnu: python-pygpgme: Fix build failure.
> >
> > * gnu/packages/patches/python-pygpgme-fix-pinentry-tests.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> > * gnu/packages/gnupg.scm (python-pygpgme, python2-pygpgme)[source]: Use it.
> 
> LGTM, thank you!

Pushed!

Re: Let’s fix build failures on ‘staging’!

[Leo Famulari]

On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
>   • python2-pillow test failures on ARM
>     https://hydra.gnu.org/build/1751907

All these failures appear to be something timing out, like this:

nose.plugins.multiprocess.TimedOutException: 'TestFileJpeg.test_subsampling'

So I just restarted it.

Re: Let’s fix build failures on ‘staging’!

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
>   • NSS test failure on ARM (breaks many things)
>     https://hydra.gnu.org/build/1749670

I'm not sure about this. How about we revert the update on staging and
create an nss-updates branch with the latest release, 3.28.1?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Let’s fix build failures on ‘staging’!

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
>>   • NSS test failure on ARM (breaks many things)
>>     https://hydra.gnu.org/build/1749670
>
> I'm not sure about this. How about we revert the update on staging and
> create an nss-updates branch with the latest release, 3.28.1?

Yes it would probably be safer, unless the previous version has security
issues of course.

Ludo’.

Re: Let’s fix build failures on ‘staging’!

[Leo Famulari]

On Sat, Jan 07, 2017 at 10:32:59PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
> >>   • NSS test failure on ARM (breaks many things)
> >>     https://hydra.gnu.org/build/1749670
> >
> > I'm not sure about this. How about we revert the update on staging and
> > create an nss-updates branch with the latest release, 3.28.1?
> 
> Yes it would probably be safer, unless the previous version has security
> issues of course.

None that I know of. In any case, we should work on merging this staging
branch, and I'll create the nss-updates branch later tonight.

Re: Let’s fix build failures on ‘staging’!

[Leo Famulari]

On Sat, Jan 07, 2017 at 12:50:33PM +0100, Ludovic Courtès wrote:
> Hello Guix!
> 
> Looking at
> <https://hydra.gnu.org/eval/109427?compare=master#tabs-now-fail> we have
> a few new failures:

I just started a new evaluation.

[PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[David Craven]

These variants are no longer needed.

This reverts commit 45591fd7fde1a400a416cb99939f6dd766445f94.
---
 gnu/packages/algebra.scm | 17 -----------------
 gnu/packages/audio.scm   |  4 ++--
 gnu/packages/music.scm   |  4 ++--
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index d09e2e83b..b859da0e7 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -577,23 +577,6 @@ cosine/ sine transforms or DCT/DST).")
      (string-append (package-description fftw)
                     "  Single-precision version."))))
 
-(define (pthread-variant p)
-  (package
-    (inherit p)
-    (name (string-append (package-name p) "-pthreads"))
-    (arguments
-     (substitute-keyword-arguments (package-arguments fftw)
-       ((#:configure-flags flags)
-        `(cons "--enable-threads" ,flags))))))
-
-;; FIXME: These packages are used temporarily by packages like Ardour until
-;; "--enable-flags" is added to the fftw and fftwf packages.
-(define-public fftw-with-threads
-  (pthread-variant fftw))
-
-(define-public fftwf-with-threads
-  (pthread-variant fftwf))
-
 (define-public fftw-openmpi
   (package (inherit fftw)
     (name "fftw-openmpi")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f0a6a54de..f3a337925 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
        ("lv2" ,lv2)
        ("vamp" ,vamp)
        ("curl" ,curl)
-       ("fftw" ,fftw-with-threads)
-       ("fftwf" ,fftwf-with-threads)
+       ("fftw" ,fftw)
+       ("fftwf" ,fftwf)
        ("jack" ,jack-1)
        ("serd" ,serd)
        ("sord" ,sord)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 59fd508f6..fc4f15cd7 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1889,8 +1889,8 @@ analogue-like user interface.")
                #t)))))
       (inputs
        `(("lilv" ,lilv)
-         ("fftw" ,fftw-with-threads)
-         ("fftwf" ,fftwf-with-threads)
+         ("fftw" ,fftw)
+         ("fftwf" ,fftwf)
          ("lv2" ,lv2)
          ("jack" ,jack-1)
          ("readline" ,readline)))
-- 
2.11.0

[PATCH 2/2] gnu: ardour: Add eudev dependency.

[David Craven]

* gnu/packages/audio.scm (ardour)[inputs]: Add eudev.
---
 gnu/packages/audio.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f3a337925..5e22c1f22 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -223,6 +223,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
        ("boost" ,boost)
        ("atkmm" ,atkmm)
        ("cairomm" ,cairomm)
+       ("eudev" ,eudev)
        ("gtkmm" ,gtkmm-2)
        ("glibmm" ,glibmm)
        ("libart-lgpl" ,libart-lgpl)
-- 
2.11.0

Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[Ricardo Wurmus]

David Craven <david@craven.ch> writes:

> These variants are no longer needed.
>
> This reverts commit 45591fd7fde1a400a416cb99939f6dd766445f94.

What commit(s) made these variants obsolete?  When I added them fftw and
fftwf did not install the threaded variants that Ardour was looking
for.  Has either ardour or fftw been updated since then or has something
else changed?

In any case, if Ardour now builds without these variants then these
patches are okay, I suppose.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net

Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[David Craven]

> What commit(s) made these variants obsolete?  When I added them fftw and
> fftwf did not install the threaded variants that Ardour was looking
> for.  Has either ardour or fftw been updated since then or has something
> else changed?
>
> In any case, if Ardour now builds without these variants then these
> patches are okay, I suppose.

This is for staging meant to fix a build failure in staging. Your
commit adds the --enable-threads flag,

86f4e9d76a75c405b3b6c5b3f1717df0e45f4e68, or am I missing something?

Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[David Craven]

Ludo added the pthread-variant procedure, it's not used anywhere else
so I don't know if we want to keep it around or not.

Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> Ludo added the pthread-variant procedure, it's not used anywhere else
> so I don't know if we want to keep it around or not.

It’s not useful outside of this specific case.

Ludo’.

Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

[Ricardo Wurmus]

David Craven <david@craven.ch> writes:

>> What commit(s) made these variants obsolete?  When I added them fftw and
>> fftwf did not install the threaded variants that Ardour was looking
>> for.  Has either ardour or fftw been updated since then or has something
>> else changed?
>>
>> In any case, if Ardour now builds without these variants then these
>> patches are okay, I suppose.
>
> This is for staging meant to fix a build failure in staging. Your
> commit adds the --enable-threads flag,
>
> 86f4e9d76a75c405b3b6c5b3f1717df0e45f4e68, or am I missing something?

You’re right.  I didn’t make the connection between my commit to staging
and your patch.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net