[bug#77294] gnu: hyprland: Change upstream to prevent crashes.

Message ID Z-Re6pfFMhm8thOx@kernelpanicroom
State New
Headers
Series [bug#77294] gnu: hyprland: Change upstream to prevent crashes. |

Commit Message

Jakob Kirsch March 26, 2025, 8:09 p.m. UTC
  From ede27d1cbd6deb643b0be4908c8e4f7e5ffd3bf5 Mon Sep 17 00:00:00 2001
Message-ID: <ede27d1cbd6deb643b0be4908c8e4f7e5ffd3bf5.1743019732.git.jakob.kirsch@web.de>
From: Jakob Kirsch <jakob.kirsch@web.de>
Date: Wed, 26 Mar 2025 21:07:36 +0100
Subject: [PATCH] gnu: hyprland: Change upstream to prevent crashes.

* gnu/packages/wm.scm (hyprland): Change upstream commit to 9ea7642 to prevent multiple possible crashes.

Change-Id: Ibb6439f0d6a4237897e5d3dd67f177f6780464f7
---
 gnu/packages/wm.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


base-commit: dbef60edb356246855ad6749936ee511fc1a9b4b
prerequisite-patch-id: 1b6720a384d413ca3a954a1e7b89ca04aa735015
--
2.49.0
  

Comments

John Kehayias March 29, 2025, 9:40 p.m. UTC | #1
Hello,

On Sat, Mar 29, 2025 at 04:52 PM, Jakob Kirsch wrote:

> From 8a1db15b5beaf0c742a4f645f320284422dbe19d Mon Sep 17 00:00:00 2001
> Message-ID: <8a1db15b5beaf0c742a4f645f320284422dbe19d.1743263528.git.jakob.kirsch@web.de>
> From: Jakob Kirsch <jakob.kirsch@web.de>
> Date: Sat, 29 Mar 2025 16:52:05 +0100
> Subject: [PATCH] gnu: hyprland: Update to 0.48.1.
>
> * gnu/packages/wm.scm (hyprland): Update to 0.48.1.
>
> Change-Id: I713a62915d79cfeac2b17bd85b57dc6956949068

Pushed as d17c20911361844ff6479704d3e26bef8f73aa5c after removing the
email headers that ended up in the commit log.

Thanks!
John

> ---
>  gnu/packages/wm.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 2eefdb4c64..b01f63629f 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -362,7 +362,7 @@ (define-public hypridle
>  (define-public hyprland
>    (package
>      (name "hyprland")
> -    (version "0.48.0")
> +    (version "0.48.1")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "https://github.com/hyprwm/Hyprland"
> @@ -379,7 +379,7 @@ (define-public hyprland
>                                "subprojects"))))
>                (sha256
>                 (base32
> -                "1adzdlz5ay5wil4l34150ciqjiir3jlyyxikdw3nw7yxb83mss8j"))))
> +                "19ip27hzaj2j2idaz33ypcslawkp9v5vpjx1gcm6ypqsip1s01h1"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list #:cmake cmake-3.30
>
> base-commit: 3746dcae31730ff405f49e1a32b506bfa827a3ea
> --
> 2.49.0
  

Patch

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2eefdb4c64..b29aaeb192 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -364,10 +364,11 @@  (define-public hyprland
     (name "hyprland")
     (version "0.48.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/hyprwm/Hyprland"
-                                  "/releases/download/v" version
-                                  "/source-v" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                (url "https://github.com/hyprwm/Hyprland")
+                ; current master as of writing, fixes a couple bugs compared to 0.48.0
+                (commit "9ea7642")))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -379,7 +380,7 @@  (define-public hyprland
                               "subprojects"))))
               (sha256
                (base32
-                "1adzdlz5ay5wil4l34150ciqjiir3jlyyxikdw3nw7yxb83mss8j"))))
+                "1kywplgk2b49m5axipppg70jrqfzndxhmx5gf7pkq6fg702429y9"))))
     (build-system cmake-build-system)
     (arguments
      (list #:cmake cmake-3.30