[bug#76263] gnu: network-manager: Update to 1.50.0.

Message ID 6894959e9ac0282612238d24be348a3ef45b16e2.1739447246.git.divya@subvertising.org
State New
Headers
Series [bug#76263] gnu: network-manager: Update to 1.50.0. |

Commit Message

Divya Ranjan Feb. 13, 2025, 11:50 a.m. UTC
  * gnu/packages/gnome.scm (network-manager): Update to 1.50.0.

Change-Id: I22d38b667fd958168b94b836a2d623a11da5489b
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: bcce7f8fa8b821b76591b297f61d473c5972e397
  

Comments

Ludovic Courtès Feb. 21, 2025, 1:56 p.m. UTC | #1
Divya Ranjan <divya@subvertising.org> skribis:

> * gnu/packages/gnome.scm (network-manager): Update to 1.50.0.

[...]

> -    (version "1.44.0")
> +    (version "1.50.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/NetworkManager/"
> @@ -8473,7 +8473,7 @@ (define-public network-manager
>                                         "network-manager-meson.patch"))
>                (sha256
>                 (base32
> -                "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd"))))
> +                "1qv6ma7lhznwcjybl9kwbnbv28k1ca0r9n65ak2fnv35i8wff0zw"))))

‘network-manager-meson.patch’ doesn’t apply:

--8<---------------cut here---------------start------------->8---
source is at 'NetworkManager-1.50.0'
applying '/gnu/store/zmrcarqi9caif1mix5cvpy542jrhcq97-network-manager-plugin-path.patch'...
patching file src/core/vpn/nm-vpn-manager.c
applying '/gnu/store/wi7x4yk7w9c3r6721y4nl55z1ak4ysn5-network-manager-meson.patch'...
patching file src/core/devices/wwan/meson.build
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file src/core/devices/wwan/meson.build.rej
Backtrace:
           5 (primitive-load "/gnu/store/c0v00hx7a7sgxgpl6sygincxipn…")
In ice-9/eval.scm:
    619:8  4 (_ #(#(#<directory (guile-user) 7ffff7850c80> "Net…") #))
In ice-9/boot-9.scm:
    142:2  3 (dynamic-wind #<procedure 7ffff77aa9e0 at ice-9/eval.s…> …)
In ice-9/eval.scm:
    619:8  2 (_ #(#(#<directory (guile-user) 7ffff7850c80>)))
In srfi/srfi-1.scm:
    634:9  1 (for-each #<procedure apply-patch (a)> _)
In guix/build/utils.scm:
    822:6  0 (invoke "/gnu/store/4jhlsg65s1zx90gnnfmaax52i8prnl45-p…" …)

guix/build/utils.scm:822:6: In procedure invoke:
ERROR:
  1. &invoke-error:
      program: "/gnu/store/4jhlsg65s1zx90gnnfmaax52i8prnl45-patch-2.7.6/bin/patch"
      arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input" "/gnu/store/wi7x4yk7w9c3r6721y4nl55z1ak4ysn5-network-manager-meson.patch")
      exit-status: 1
      term-signal: #f
      stop-signal: #f
builder for `/gnu/store/jpkcjngyinw6jawjhffckd8f5ngk9asa-NetworkManager-1.50.0.tar.zst.drv' failed with exit code 1
build of /gnu/store/jpkcjngyinw6jawjhffckd8f5ngk9asa-NetworkManager-1.50.0.tar.zst.drv failed
--8<---------------cut here---------------end--------------->8---

Could you take a look?

TIA,
Ludo’.
  
Maxim Cournoyer Feb. 21, 2025, 2:12 p.m. UTC | #2
Hi!

Divya Ranjan <divya@subvertising.org> writes:

> * gnu/packages/gnome.scm (network-manager): Update to 1.50.0.
>
> Change-Id: I22d38b667fd958168b94b836a2d623a11da5489b
> ---
>  gnu/packages/gnome.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 1e8d813682..4c0f6feb04 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -8463,7 +8463,7 @@ (define-public network-manager
>      (name "network-manager")
>      ;; Note: NetworkManager still follows the odd/even major version number
>      ;; for development/stable releases scheme; be sure to use a stable one.
> -    (version "1.44.0")
> +    (version "1.50.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/NetworkManager/"
> @@ -8473,7 +8473,7 @@ (define-public network-manager
>                                         "network-manager-meson.patch"))
>                (sha256
>                 (base32
> -                "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd"))))
> +                "1qv6ma7lhznwcjybl9kwbnbv28k1ca0r9n65ak2fnv35i8wff0zw"))))
>      (build-system meson-build-system)

Did you test this was compatible with the current libraries on the
gnome-team branch?  What about the various plugins?  It's typically
safer to update these together.
  
Divya Ranjan Feb. 22, 2025, 12:57 p.m. UTC | #3
Hello Maxim,

> Did you test this was compatible with the current libraries on the
> gnome-team branch?  What about the various plugins?  It's typically
> safer to update these together.

I haven’t tested the gnome-team branch, I shall try and report.

Regards,
  
Divya Ranjan March 5, 2025, 10:33 p.m. UTC | #4
Hello Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi!
>
> Divya Ranjan <divya@subvertising.org> writes:
>
>> * gnu/packages/gnome.scm (network-manager): Update to 1.50.0.
>>
>> Change-Id: I22d38b667fd958168b94b836a2d623a11da5489b
>> ---
>>  gnu/packages/gnome.scm | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> index 1e8d813682..4c0f6feb04 100644
>> --- a/gnu/packages/gnome.scm
>> +++ b/gnu/packages/gnome.scm
>> @@ -8463,7 +8463,7 @@ (define-public network-manager
>>      (name "network-manager")
>>      ;; Note: NetworkManager still follows the odd/even major version number
>>      ;; for development/stable releases scheme; be sure to use a stable one.
>> -    (version "1.44.0")
>> +    (version "1.50.0")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append "mirror://gnome/sources/NetworkManager/"
>> @@ -8473,7 +8473,7 @@ (define-public network-manager
>>                                         "network-manager-meson.patch"))
>>                (sha256
>>                 (base32
>> -                "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd"))))
>> +                "1qv6ma7lhznwcjybl9kwbnbv28k1ca0r9n65ak2fnv35i8wff0zw"))))
>>      (build-system meson-build-system)
>
> Did you test this was compatible with the current libraries on the
> gnome-team branch?  What about the various plugins?  It's typically
> safer to update these together.

Indeed, I checked on the gnome-team branch and it builds fine, as it does on master. So the issue Ludo mentioned above is no longer faced, after the upgrade to 1.48.2.
  
Maxim Cournoyer March 6, 2025, 12:51 a.m. UTC | #5
Hi Divya,

Divya Ranjan <divya@subvertising.org> writes:

[...]

> Indeed, I checked on the gnome-team branch and it builds fine, as it
> does on master. So the issue Ludo mentioned above is no longer faced,
> after the upgrade to 1.48.2.

Is there still value in merging this bump to 1.50.0?  Have you tested it on
our system?

Otherwise let's close it.
  
Divya Ranjan March 6, 2025, 2:42 a.m. UTC | #6
Well, I opened this because I needed 1.50.0, and yes I tested the build on my system.

On 6 March 2025 00:51:15 GMT, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>Hi Divya,
>
>Divya Ranjan <divya@subvertising.org> writes:
>
>[...]
>
>> Indeed, I checked on the gnome-team branch and it builds fine, as it
>> does on master. So the issue Ludo mentioned above is no longer faced,
>> after the upgrade to 1.48.2.
>
>Is there still value in merging this bump to 1.50.0?  Have you tested it on
>our system?
>
>Otherwise let's close it.
>
>-- 
>Thanks,
>Maxim

Divya Ranjan, Mathematics, Philosophy and Libre Software
  
Maxim Cournoyer March 6, 2025, 5:35 a.m. UTC | #7
Hi Divya,

Divya Ranjan <divya@subvertising.org> writes:

> Well, I opened this because I needed 1.50.0, and yes I tested the build on my system.

Alright, thanks for the information, I guess we can merge it to master
then.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
  
Maxim Cournoyer March 6, 2025, 4:12 p.m. UTC | #8
Hi,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi Divya,
>
> Divya Ranjan <divya@subvertising.org> writes:
>
>> Well, I opened this because I needed 1.50.0, and yes I tested the build on my system.
>
> Alright, thanks for the information, I guess we can merge it to master
> then.
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

Done, and followed by an update to the freshly released 1.52.0.
  

Patch

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1e8d813682..4c0f6feb04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8463,7 +8463,7 @@  (define-public network-manager
     (name "network-manager")
     ;; Note: NetworkManager still follows the odd/even major version number
     ;; for development/stable releases scheme; be sure to use a stable one.
-    (version "1.44.0")
+    (version "1.50.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -8473,7 +8473,7 @@  (define-public network-manager
                                        "network-manager-meson.patch"))
               (sha256
                (base32
-                "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd"))))
+                "1qv6ma7lhznwcjybl9kwbnbv28k1ca0r9n65ak2fnv35i8wff0zw"))))
     (build-system meson-build-system)
     (outputs '("out"
                "doc"))                  ; 8 MiB of gtk-doc HTML