* bug#24026: librecad and dealii depend on relocated muparser source code repo
@ 2016-07-19 16:42 Mark H Weaver
2016-07-20 6:26 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2016-07-19 16:42 UTC (permalink / raw)
To: 24026
The dealii, dealii-openmpi, and librecad packages are now failing
due to a missing dependency:
svn: E160013: Unable to connect to a repository at URL 'http://muparser.googlecode.com/svn/trunk'
svn: E160013: '/svn/trunk' path not found
It seems that the muparser developers have switched to github.
Mark
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#24026: librecad and dealii depend on relocated muparser source code repo
2016-07-19 16:42 bug#24026: librecad and dealii depend on relocated muparser source code repo Mark H Weaver
@ 2016-07-20 6:26 ` Leo Famulari
2016-07-20 11:07 ` Mark H Weaver
0 siblings, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2016-07-20 6:26 UTC (permalink / raw)
To: Mark H Weaver; +Cc: 24026
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
On Tue, Jul 19, 2016 at 12:42:57PM -0400, Mark H Weaver wrote:
> The dealii, dealii-openmpi, and librecad packages are now failing
> due to a missing dependency:
>
> svn: E160013: Unable to connect to a repository at URL 'http://muparser.googlecode.com/svn/trunk'
> svn: E160013: '/svn/trunk' path not found
>
> It seems that the muparser developers have switched to github.
Dealii, dealii-openmpi, and librecad build successfully using the 2.2.5
tarball from the new github repo.
The hash of the source has changed, but the version has not. Do you
think this will be a problem? I think that `guix package -u` won't work
correctly.
[-- Attachment #2: 0001-gnu-muparser-Update-source-URL.patch --]
[-- Type: text/x-diff, Size: 1867 bytes --]
From bac851145afdf5e76ccf2e246d0ee745901e5e8f Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 20 Jul 2016 02:17:30 -0400
Subject: [PATCH] gnu: muparser: Update source URL.
* gnu/packages/maths.scm (muparser)[source]: Update source URL to new location.
Use URL-FETCH instead of SVN-FETCH. Update hash.
---
gnu/packages/maths.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b8ec213..c55354a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,6 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
- #:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix build-system cmake)
@@ -1796,13 +1796,12 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
(version "2.2.5")
(source
(origin
- (method svn-fetch)
- (uri (svn-reference
- (url "http://muparser.googlecode.com/svn/trunk/")
- (revision 34)))
+ (method url-fetch)
+ (uri (string-append "https://github.com/beltoforion/muparser/archive/v"
+ version ".tar.gz"))
(sha256
(base32
- "1d6bdbhx9zj3srwj3m7c9hvr18gnx1fx43h6d25my7q85gicpcwn"))))
+ "0277qsi5l23jsck1vhn383bmvc2n9l4a1dl5r9bf7hvjv9ayyrh6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-samples=no")
--
2.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#24026: librecad and dealii depend on relocated muparser source code repo
2016-07-20 6:26 ` Leo Famulari
@ 2016-07-20 11:07 ` Mark H Weaver
2016-07-20 16:39 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2016-07-20 11:07 UTC (permalink / raw)
To: Leo Famulari; +Cc: 24026
Leo Famulari <leo@famulari.name> writes:
> On Tue, Jul 19, 2016 at 12:42:57PM -0400, Mark H Weaver wrote:
>> The dealii, dealii-openmpi, and librecad packages are now failing
>> due to a missing dependency:
>>
>> svn: E160013: Unable to connect to a repository at URL 'http://muparser.googlecode.com/svn/trunk'
>> svn: E160013: '/svn/trunk' path not found
>>
>> It seems that the muparser developers have switched to github.
>
> Dealii, dealii-openmpi, and librecad build successfully using the 2.2.5
> tarball from the new github repo.
>
> The hash of the source has changed, but the version has not. Do you
> think this will be a problem? I think that `guix package -u` won't work
> correctly.
Hmm. It would be good to see the diff between the two "versions" of
2.2.5. If there's anything substantive in there, then we might want to
bump the version on our behalf. Otherwise it probably doesn't matter.
What do you think?
> @@ -1796,13 +1796,12 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
> (version "2.2.5")
> (source
> (origin
> - (method svn-fetch)
> - (uri (svn-reference
> - (url "http://muparser.googlecode.com/svn/trunk/")
> - (revision 34)))
> + (method url-fetch)
> + (uri (string-append "https://github.com/beltoforion/muparser/archive/v"
> + version ".tar.gz"))
This 'origin' needs a 'file-name' field. Otherwise it looks good to me.
Thanks!
Mark
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#24026: librecad and dealii depend on relocated muparser source code repo
2016-07-20 11:07 ` Mark H Weaver
@ 2016-07-20 16:39 ` Leo Famulari
2016-07-21 4:52 ` Eric Bavier
0 siblings, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2016-07-20 16:39 UTC (permalink / raw)
To: Mark H Weaver; +Cc: 24026
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
On Wed, Jul 20, 2016 at 07:07:25AM -0400, Mark H Weaver wrote:
> Hmm. It would be good to see the diff between the two "versions" of
> 2.2.5. If there's anything substantive in there, then we might want to
> bump the version on our behalf. Otherwise it probably doesn't matter.
The difference seem trivial to me. There are fixed typos in comments,
and code changes in 'example1.cpp'. I assume that 'example1.cpp' is
unimportant, but I don't know.
What do you think about the attached patch?
[-- Attachment #2: 0001-gnu-muparser-Update-source-URL.patch --]
[-- Type: text/x-diff, Size: 3310 bytes --]
From 3ba3928f107d365bcc68c37136f04d0402401c84 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 20 Jul 2016 02:17:30 -0400
Subject: [PATCH] gnu: muparser: Update source URL.
* gnu/packages/maths.scm (muparser)[source]: Update source URL to new location.
Use URL-FETCH instead of SVN-FETCH. Update hash and package revision.
---
gnu/packages/maths.scm | 50 ++++++++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b8ec213..22b7bdc 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,6 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
- #:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix build-system cmake)
@@ -1791,29 +1791,31 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
"1cdpjxb0fz5f28y5qrqgpw53s7qi8s2v3al9lfdldqxngb21vpx8"))))))
(define-public muparser
- (package
- (name "muparser")
- (version "2.2.5")
- (source
- (origin
- (method svn-fetch)
- (uri (svn-reference
- (url "http://muparser.googlecode.com/svn/trunk/")
- (revision 34)))
- (sha256
- (base32
- "1d6bdbhx9zj3srwj3m7c9hvr18gnx1fx43h6d25my7q85gicpcwn"))))
- (build-system gnu-build-system)
- (arguments
- `(#:configure-flags '("--enable-samples=no")
- #:tests? #f)) ;no "check" target
- (home-page "http://muparser.beltoforion.de/")
- (synopsis "Fast parser library for mathematical expressions")
- (description
- "muParser is an extensible high performance math parser library. It is
-based on transforming an expression into a bytecode and precalculating
-constant parts of it.")
- (license license:expat)))
+ (let ((upstream-version "2.2.5")
+ (revision "2"))
+ (package
+ (name "muparser")
+ (version (string-append upstream-version "-" revision))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/beltoforion/muparser/archive/v"
+ upstream-version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0277qsi5l23jsck1vhn383bmvc2n9l4a1dl5r9bf7hvjv9ayyrh6"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--enable-samples=no")
+ #:tests? #f)) ;no "check" target
+ (home-page "http://muparser.beltoforion.de/")
+ (synopsis "Fast parser library for mathematical expressions")
+ (description
+ "muParser is an extensible high performance math parser library. It is
+based on transforming an expression into a bytecode and precalculating constant
+parts of it.")
+ (license license:expat))))
(define-public openblas
(package
--
2.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#24026: librecad and dealii depend on relocated muparser source code repo
2016-07-20 16:39 ` Leo Famulari
@ 2016-07-21 4:52 ` Eric Bavier
2016-07-21 22:26 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Eric Bavier @ 2016-07-21 4:52 UTC (permalink / raw)
To: Leo Famulari; +Cc: 24026
On Wed, 20 Jul 2016 12:39:45 -0400
Leo Famulari <leo@famulari.name> wrote:
> On Wed, Jul 20, 2016 at 07:07:25AM -0400, Mark H Weaver wrote:
> > Hmm. It would be good to see the diff between the two "versions" of
> > 2.2.5. If there's anything substantive in there, then we might want to
> > bump the version on our behalf. Otherwise it probably doesn't matter.
>
> The difference seem trivial to me. There are fixed typos in comments,
> and code changes in 'example1.cpp'. I assume that 'example1.cpp' is
> unimportant, but I don't know.
>
> What do you think about the attached patch?
LGTM.
`~Eric
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#24026: librecad and dealii depend on relocated muparser source code repo
2016-07-21 4:52 ` Eric Bavier
@ 2016-07-21 22:26 ` Leo Famulari
0 siblings, 0 replies; 6+ messages in thread
From: Leo Famulari @ 2016-07-21 22:26 UTC (permalink / raw)
To: Eric Bavier; +Cc: 24026-done
On Wed, Jul 20, 2016 at 11:52:00PM -0500, Eric Bavier wrote:
> On Wed, 20 Jul 2016 12:39:45 -0400
> Leo Famulari <leo@famulari.name> wrote:
>
> > On Wed, Jul 20, 2016 at 07:07:25AM -0400, Mark H Weaver wrote:
> > > Hmm. It would be good to see the diff between the two "versions" of
> > > 2.2.5. If there's anything substantive in there, then we might want to
> > > bump the version on our behalf. Otherwise it probably doesn't matter.
> >
> > The difference seem trivial to me. There are fixed typos in comments,
> > and code changes in 'example1.cpp'. I assume that 'example1.cpp' is
> > unimportant, but I don't know.
> >
> > What do you think about the attached patch?
>
> LGTM.
Thanks for the review!
Pushed as d7cff656d.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-07-21 22:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-19 16:42 bug#24026: librecad and dealii depend on relocated muparser source code repo Mark H Weaver
2016-07-20 6:26 ` Leo Famulari
2016-07-20 11:07 ` Mark H Weaver
2016-07-20 16:39 ` Leo Famulari
2016-07-21 4:52 ` Eric Bavier
2016-07-21 22:26 ` Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).