[PATCH 0/3] Update boost variant URIs to be consistent and valid

  • Done
  • quality assurance status badge
Details
3 participants
  • Ada Stevenson
  • Greg Hogan
  • Efraim Flashner
Owner
unassigned
Submitted by
Ada Stevenson
Severity
normal

Debbugs page

A
A
Ada Stevenson wrote on 17 Mar 01:09 -0700
(address . guix-patches@gnu.org)(name . Ada Stevenson)(address . adanskana@gmail.com)
cover.1742198595.git.adanskana@gmail.com
The URI for `boost-for-source-highlight` was dead, as it used the same one the main boost package used that was fixed in be6f1d0fe4.
The other boost variants included in this patch have been updated to follow the established style in the main boost package.

Ada Stevenson (3):
gnu: boost-for-source-highlight: Update source URI
gnu: boost-for-irods: Update source URI
gnu: boost-for-mysql: Update source URI

gnu/packages/boost.scm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)


base-commit: fd19785a9a7f111c6a97da25187c3351e7e8f3fd
--
2.48.1
A
A
Ada Stevenson wrote on 17 Mar 01:15 -0700
[PATCH 1/3] gnu: boost-for-source-highlight: Update source URI
(address . 77066@debbugs.gnu.org)(name . Ada Stevenson)(address . adanskana@gmail.com)
82d6b20350b52125c7da5085e1d4ecb6c4242cc0.1742198595.git.adanskana@gmail.com
* gnu/packages/boost.scm (boost-for-source-highlight)
[source] <uri>: Update dead link to active link.

Change-Id: Ib10a2ef6b57bc787a34d62eaaa0885a5dcd0a1a8
---
gnu/packages/boost.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index e464400ad9..cb45b2efd9 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -212,7 +212,7 @@ (define-public boost-for-source-highlight
(version "1.83.0")
(source (origin
(method url-fetch)
- (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
+ (uri (string-append "https://archives.boost.io/release/"
version "/source/boost_"
(version-with-underscores version) ".tar.bz2"))
(patches
--
2.48.1
A
A
Ada Stevenson wrote on 17 Mar 01:15 -0700
[PATCH 2/3] gnu: boost-for-irods: Update source URI
(address . 77066@debbugs.gnu.org)(name . Ada Stevenson)(address . adanskana@gmail.com)
8b2b9315df60d63a069d3e84f83e3eb9296ee538.1742198595.git.adanskana@gmail.com
* gnu/packages/boost.scm (boost-for-irods)
[source] <uri>: Update uri to align with other boost packages.

Change-Id: I04559b146226c0d7b0658693fb36887f249e8af5
---
gnu/packages/boost.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index cb45b2efd9..c53cac0c0a 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -232,10 +232,9 @@ (define-public boost-for-irods
(version "1.68.0")
(source (origin
(method url-fetch)
- (uri (string-append
- "mirror://sourceforge/boost/boost/" version "/boost_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.bz2"))
+ (uri (string-append "https://archives.boost.io/release/"
+ version "/source/boost_"
+ (version-with-underscores version) ".tar.bz2"))
(sha256
(base32
"1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz"))))
--
2.48.1
A
A
Ada Stevenson wrote on 17 Mar 01:15 -0700
[PATCH 3/3] gnu: boost-for-mysql: Update source URI
(address . 77066@debbugs.gnu.org)(name . Ada Stevenson)(address . adanskana@gmail.com)
d4af7145acf8342f3c1502b13c5259df686ad931.1742198595.git.adanskana@gmail.com
* gnu/packages/boost.scm (boost-for-mysql)
[source] <uri>: Update uri to align with other boost packages.

Change-Id: I1ddd8b25d8ab60ab791c89b4ee79f0e02f6b56d2
---
gnu/packages/boost.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index c53cac0c0a..4f54c6b578 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -324,10 +324,9 @@ (define-public boost-for-mysql
(version "1.59.0")
(source (origin
(method url-fetch)
- (uri (string-append
- "mirror://sourceforge/boost/boost/" version "/boost_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.bz2"))
+ (uri (string-append "https://archives.boost.io/release/"
+ version "/source/boost_"
+ (version-with-underscores version) ".tar.bz2"))
(sha256
(base32
"1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))
--
2.48.1
A
A
Ada Stevenson wrote on 17 Mar 01:19 -0700
Manipulate bug 77066
(address . control@debbugs.gnu.org)
a806c81c-2559-4f6b-a53e-b7818ab8b5a1@gmail.com
tags 77066 + easy
thanks
G
G
Greg Hogan wrote on 17 Mar 06:03 -0700
Re: [bug#77066] [PATCH 1/3] gnu: boost-for-source-highlight: Update source URI
(name . Ada Stevenson)(address . adanskana@gmail.com)
CA+3U0ZkRmwRtOPi6DT2gc1XQK=1VGw33o_g6gbCjEUBSnVG+Vg@mail.gmail.com
On Mon, Mar 17, 2025 at 4:17 AM Ada Stevenson <adanskana@gmail.com> wrote:
Toggle quote (25 lines)
>
> * gnu/packages/boost.scm (boost-for-source-highlight)
> [source] <uri>: Update dead link to active link.
>
> Change-Id: Ib10a2ef6b57bc787a34d62eaaa0885a5dcd0a1a8
> ---
> gnu/packages/boost.scm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
> index e464400ad9..cb45b2efd9 100644
> --- a/gnu/packages/boost.scm
> +++ b/gnu/packages/boost.scm
> @@ -212,7 +212,7 @@ (define-public boost-for-source-highlight
> (version "1.83.0")
> (source (origin
> (method url-fetch)
> - (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
> + (uri (string-append "https://archives.boost.io/release/"
> version "/source/boost_"
> (version-with-underscores version) ".tar.bz2"))
> (patches
> --
> 2.48.1

cc'ing the rust team because source-highlight has ~12,000 dependent
packages, nearly all due to gdb/pinned which is a dependency of rust.
E
E
Efraim Flashner wrote on 17 Mar 08:13 -0700
(name . Greg Hogan)(address . code@greghogan.com)
Z9g8Azr0U59VTGC6@X1
On Mon, Mar 17, 2025 at 09:03:20AM -0400, Greg Hogan wrote:
Toggle quote (29 lines)
> On Mon, Mar 17, 2025 at 4:17 AM Ada Stevenson <adanskana@gmail.com> wrote:
> >
> > * gnu/packages/boost.scm (boost-for-source-highlight)
> > [source] <uri>: Update dead link to active link.
> >
> > Change-Id: Ib10a2ef6b57bc787a34d62eaaa0885a5dcd0a1a8
> > ---
> > gnu/packages/boost.scm | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
> > index e464400ad9..cb45b2efd9 100644
> > --- a/gnu/packages/boost.scm
> > +++ b/gnu/packages/boost.scm
> > @@ -212,7 +212,7 @@ (define-public boost-for-source-highlight
> > (version "1.83.0")
> > (source (origin
> > (method url-fetch)
> > - (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
> > + (uri (string-append "https://archives.boost.io/release/"
> > version "/source/boost_"
> > (version-with-underscores version) ".tar.bz2"))
> > (patches
> > --
> > 2.48.1
>
> cc'ing the rust team because source-highlight has ~12,000 dependent
> packages, nearly all due to gdb/pinned which is a dependency of rust.

Does this cause a rebuild of anything? If it doesn't then it should be
fine for master. If it does cause rebuilds then we can grab it for the
rust-team branch (or another one even).

--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmfYO/4ACgkQQarn3Mo9
g1E/cg//VknBWYX7jr0CgWdxmWj+61mjuAGg9+5NXdWagJ2+2Bdacp+vf0BXG4N9
jPhU7j+WT5V2zpXwMV1/WhKsOccD7KcWnZ0Z0xJwGyDgh2hE9zo1YiUfzLUWa0LZ
rcX4zIVIu4g31d+ljzEtDlJ4FmylYkFBHszbBQS7rzNS6xVIPctOIxiIpJptxKs2
Jf1XQd3WT+soIEQV2lE6M7ihRVyYn79ZqEeQeaWA+4fg8uqiqkhYcA2KoxNJHEQ2
YL17eW+0qJmGxm8a6hWxP5U/UmjVlxxlkzgiEcvoL9e16koSDVyLBG5qw6SEv0cv
BI/yxu88AN25mDjoDo+O5oMSzhKH4HwrSqHGBsLYo4aDQx4d5xJAZtpj+OLpWMBW
//Ns7y6X8f8bMmC+povXZ4GZYnpNXY5tWz93VpNpUO6D0CTTLH8HfGOhW9p2XhbP
w6ixcQ2ax5us5J0l0tbx2IRLssK3hTfyF8S5YczN8+FLiQ3Gh6Q0i3pfJXQlxkwF
SiJoDOUXdbDSWTJrBX/A7t9OMyXiqXjpEVdxaWyNIf0Ef3BlaoaDpKYnKrhDhWf0
HNkUVsuVHd1h24ACzvRTTRxIV1IzbKADdlrJFSDU7w85S81vwa8vyqFJqXjzW+FD
Ln9I1rLggHnyrN4FAZMD5on27G6CkjPQS7+mo+JCZXH6veWHax0=
=63Vc
-----END PGP SIGNATURE-----


A
A
Ada Stevenson wrote on 17 Mar 23:22 -0700
90c60ff9-7586-4bda-a8da-e1d100342081@gmail.com
Hi,

I don't believe this triggers a rebuild, since the source hash is the
same. Running on my local system, Guix still reached for the
substitutes, despite the changed package definition.

On 17/03/2025 3:13 pm, Efraim Flashner wrote:
Toggle quote (35 lines)
> On Mon, Mar 17, 2025 at 09:03:20AM -0400, Greg Hogan wrote:
>> On Mon, Mar 17, 2025 at 4:17 AM Ada Stevenson <adanskana@gmail.com> wrote:
>>>
>>> * gnu/packages/boost.scm (boost-for-source-highlight)
>>> [source] <uri>: Update dead link to active link.
>>>
>>> Change-Id: Ib10a2ef6b57bc787a34d62eaaa0885a5dcd0a1a8
>>> ---
>>> gnu/packages/boost.scm | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
>>> index e464400ad9..cb45b2efd9 100644
>>> --- a/gnu/packages/boost.scm
>>> +++ b/gnu/packages/boost.scm
>>> @@ -212,7 +212,7 @@ (define-public boost-for-source-highlight
>>> (version "1.83.0")
>>> (source (origin
>>> (method url-fetch)
>>> - (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
>>> + (uri (string-append "https://archives.boost.io/release/"
>>> version "/source/boost_"
>>> (version-with-underscores version) ".tar.bz2"))
>>> (patches
>>> --
>>> 2.48.1
>>
>> cc'ing the rust team because source-highlight has ~12,000 dependent
>> packages, nearly all due to gdb/pinned which is a dependency of rust.
>
> Does this cause a rebuild of anything? If it doesn't then it should be
> fine for master. If it does cause rebuilds then we can grab it for the
> rust-team branch (or another one even).
>

--
Warmly,
Ada
G
G
Greg Hogan wrote on 18 Mar 12:51 -0700
Re: [bug#77066] [PATCH 0/3] Update boost variant URIs to be consistent and valid
(name . Ada Stevenson)(address . adanskana@gmail.com)(address . 77066@debbugs.gnu.org)
CA+3U0Z=DN3R+RYmc5wOAd5RDg+Oft1fRBev9WU+8g7K2vv2A_Q@mail.gmail.com
On Mon, Mar 17, 2025 at 4:11 AM Ada Stevenson <adanskana@gmail.com> wrote:
Toggle quote (17 lines)
>
> The URI for `boost-for-source-highlight` was dead, as it used the same one the main boost package used that was fixed in be6f1d0fe4.
> The other boost variants included in this patch have been updated to follow the established style in the main boost package.
>
> Ada Stevenson (3):
> gnu: boost-for-source-highlight: Update source URI
> gnu: boost-for-irods: Update source URI
> gnu: boost-for-mysql: Update source URI
>
> gnu/packages/boost.scm | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
>
> base-commit: fd19785a9a7f111c6a97da25187c3351e7e8f3fd
> --
> 2.48.1

boost-for-(irods|mysql) pushed as
80b920674d79a15bba90fc789ed4bfc90aaa2569^..38d12e88e814728fb67bd3759dcbb07936bd017e.

As noted earlier, boost-for-source-highlight should go on the rust-team branch.
G
G
Greg Hogan wrote on 19 Mar 07:18 -0700
Re: [bug#77066] [PATCH 1/3] gnu: boost-for-source-highlight: Update source URI
(name . Ada Stevenson)(address . adanskana@gmail.com)
CA+3U0ZmhzcSMJkm8KuysE7Z5CEP5DZaG_6RKsuMhUAV+7w9Chw@mail.gmail.com
On Tue, Mar 18, 2025 at 2:22 AM Ada Stevenson <adanskana@gmail.com> wrote:
Toggle quote (47 lines)
>
> Hi,
>
> I don't believe this triggers a rebuild, since the source hash is the
> same. Running on my local system, Guix still reached for the
> substitutes, despite the changed package definition.
>
> On 17/03/2025 3:13 pm, Efraim Flashner wrote:
> > On Mon, Mar 17, 2025 at 09:03:20AM -0400, Greg Hogan wrote:
> >> On Mon, Mar 17, 2025 at 4:17 AM Ada Stevenson <adanskana@gmail.com> wrote:
> >>>
> >>> * gnu/packages/boost.scm (boost-for-source-highlight)
> >>> [source] <uri>: Update dead link to active link.
> >>>
> >>> Change-Id: Ib10a2ef6b57bc787a34d62eaaa0885a5dcd0a1a8
> >>> ---
> >>> gnu/packages/boost.scm | 2 +-
> >>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
> >>> index e464400ad9..cb45b2efd9 100644
> >>> --- a/gnu/packages/boost.scm
> >>> +++ b/gnu/packages/boost.scm
> >>> @@ -212,7 +212,7 @@ (define-public boost-for-source-highlight
> >>> (version "1.83.0")
> >>> (source (origin
> >>> (method url-fetch)
> >>> - (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
> >>> + (uri (string-append "https://archives.boost.io/release/"
> >>> version "/source/boost_"
> >>> (version-with-underscores version) ".tar.bz2"))
> >>> (patches
> >>> --
> >>> 2.48.1
> >>
> >> cc'ing the rust team because source-highlight has ~12,000 dependent
> >> packages, nearly all due to gdb/pinned which is a dependency of rust.
> >
> > Does this cause a rebuild of anything? If it doesn't then it should be
> > fine for master. If it does cause rebuilds then we can grab it for the
> > rust-team branch (or another one even).
> >
>
> --
> Warmly,
> Ada

You are both right, and my understanding of what perturbates a Guix
derivation has also now been updated.

The last commit is pushed as d88d271de774b785c49c0e554231f65336067275.

Thank you for the patchset, Ada.

Greg
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 77066@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 77066
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch