Patchwork python-updates

login
register
mail settings
Submitter Ludovic Courtès
Date Aug. 4, 2016, 8:56 p.m.
Message ID <87oa58s164.fsf_-_@gnu.org>
Download mbox | patch
Permalink /patch/14319/
State New
Headers show

Comments

Ludovic Courtès - Aug. 4, 2016, 8:56 p.m.
Hello!

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
>> The ‘python-updates’ branch would seem right to me.
>
> The brand new python-updates branch is now ready for more Python-related
> commits!

The build farm is almost idle now, apart from a long list of mips64el
builds.  So I think it’s time to merge master in python-updates and get
it built!  Thoughts?

I think it’s a good idea to upgrade Guile 2.0 at the same time, since
that’s a safe upgrade.  The patch below does that, but note that it does
not change ‘guile-2.0/fixed’, which is the Guile we use in all the
derivations; that one we’ll upgrade in core-updates.

Ludo’.
Leo Famulari - Aug. 4, 2016, 9:23 p.m.
On Thu, Aug 04, 2016 at 10:56:51PM +0200, Ludovic Courtès wrote:
> Hello!
> 
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
> >> The ‘python-updates’ branch would seem right to me.
> >
> > The brand new python-updates branch is now ready for more Python-related
> > commits!
> 
> The build farm is almost idle now, apart from a long list of mips64el
> builds.  So I think it’s time to merge master in python-updates and get
> it built!  Thoughts?

I'd like to upgrade setuptools as well. I should have pushed a patch for
that in an hour or so.

> that’s a safe upgrade.  The patch below does that, but note that it does
> not change ‘guile-2.0/fixed’, which is the Guile we use in all the
> derivations; that one we’ll upgrade in core-updates.

Okay. I noticed you pasted a diff rather than a patch. Will you push the
patch or should one of us?
Leo Famulari - Aug. 4, 2016, 9:54 p.m.
On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> I'd like to upgrade setuptools as well. I should have pushed a patch for
> that in an hour or so.

This is done. Hopefully it all works!
Andreas Enge - Aug. 5, 2016, 12:13 p.m.
On Thu, Aug 04, 2016 at 05:54:21PM -0400, Leo Famulari wrote:
> On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> > I'd like to upgrade setuptools as well. I should have pushed a patch for
> > that in an hour or so.
> This is done. Hopefully it all works!

I added a jobset on hydra:
   http://hydra.gnu.org/jobset/gnu/python-updates

This allowed me to spot a mistake with the setuptools URL, which I corrected;
I will start a new evaluation now.

Andreas
Leo Famulari - Aug. 5, 2016, 3:06 p.m.
On Fri, Aug 05, 2016 at 02:13:08PM +0200, Andreas Enge wrote:
> On Thu, Aug 04, 2016 at 05:54:21PM -0400, Leo Famulari wrote:
> > On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> > > I'd like to upgrade setuptools as well. I should have pushed a patch for
> > > that in an hour or so.
> > This is done. Hopefully it all works!
> 
> I added a jobset on hydra:
>    http://hydra.gnu.org/jobset/gnu/python-updates
> 
> This allowed me to spot a mistake with the setuptools URL, which I corrected;
> I will start a new evaluation now.

Okay, thanks! But, shouldn't we merge master into python-updates first?
The python-updates branch was rather old.

Also, I can do the guile-2.0 update that Ludovic requested.
Leo Famulari - Aug. 5, 2016, 3:43 p.m.
On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> Also, I can do the guile-2.0 update that Ludovic requested.

This I pushed as bd21159eba2cce3ca7226faa4772df64df06605d

> Okay, thanks! But, shouldn't we merge master into python-updates first?
> The python-updates branch was rather old.

I did the merge locally, but I can't push the result to Savannah. I
don't get any useful error messages:

$ git push origin python-updates
error: failed to push some refs to 'ssh://lfam@git.sv.gnu.org/srv/git/guix.git'
Andreas Enge - Aug. 5, 2016, 9:42 p.m.
On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> Also, I can do the guile-2.0 update that Ludovic requested.

The patch fails to apply:
   http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
Hopefully it is not needed any more?

Andreas
Mark H Weaver - Aug. 5, 2016, 9:57 p.m.
Andreas Enge <andreas@enge.fr> writes:

> On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
>> Also, I can do the guile-2.0 update that Ludovic requested.
>
> The patch fails to apply:
>    http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
> Hopefully it is not needed any more?

guile-arm-fixes.patch should not be needed for guile 2.0.12.

    Thanks,
      Mark
Leo Famulari - Aug. 5, 2016, 11:03 p.m.
On Fri, Aug 05, 2016 at 05:57:43PM -0400, Mark H Weaver wrote:
> Andreas Enge <andreas@enge.fr> writes:
> 
> > On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> >> Also, I can do the guile-2.0 update that Ludovic requested.
> >
> > The patch fails to apply:
> >    http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
> > Hopefully it is not needed any more?
> 
> guile-arm-fixes.patch should not be needed for guile 2.0.12.

Bah, fixed as fd90ea23548b7492631146b8886a5d38d8819f83.

Sorry for the sloppiness.

Patch

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index f50605a..f39e768 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -130,14 +130,14 @@  without requiring the source code to be rewritten.")
 (define-public guile-2.0
   (package
    (name "guile")
-   (version "2.0.11")
+   (version "2.0.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/guile/guile-" version
                                 ".tar.xz"))
             (sha256
              (base32
-              "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))
+              "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy"))
             (patches (search-patches "guile-arm-fixes.patch"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkgconfig" ,pkg-config)))
@@ -199,7 +199,17 @@  without requiring the source code to be rewritten.")
 (define-public guile-2.0/fixed
   ;; A package of Guile 2.0 that's rarely changed.  It is the one used
   ;; in the `base' module, and thus changing it entails a full rebuild.
-  guile-2.0)
+  (package
+    (inherit guile-2.0)
+    (version "2.0.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/guile/guile-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))
+              (patches (search-patches "guile-arm-fixes.patch"))))))
 
 (define-public guile-next
   (package (inherit guile-2.0)