GNU bug report logs - #78578
[PATCH] gnu: heimdall: Update to 2.2.1.

Previous Next

To reply to this bug, email your comments to 78578 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: heimdall: Update to 2.2.1.
Date: Sat, 24 May 2025 15:18:03 +0200

* gnu/packages/flashing-tools.scm (heimdall): Update to 2.2.1.
[source]: Fetch from https://git.sr.ht/~grimler/Heimdall.
[inputs]: Update qtbase-5 to qtbase, qtwayland-5 to qtwayland.
[native-inputs]: Add pkg-config.

Change-Id: I2b99926626b553f9f5ef50e62ae559174f9873ab
---
 gnu/packages/flashing-tools.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index e99a38ec2d7..ea112b3ffab 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -344,16 +344,16 @@ (define-public rkflashtool
 (define-public heimdall
   (package
     (name "heimdall")
-    (version "1.4.2")
+    (version "2.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://gitlab.com/BenjaminDobell/Heimdall.git")
+                     (url "https://git.sr.ht/~grimler/Heimdall")
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz"))))
+                "08sxn48jljrcily77g8yj89rhzwk0gjrz9lkglgrwl587x6q7sf7"))))
     (build-system qt-build-system)
     (arguments
      `(#:build-type "Release"
@@ -377,7 +377,8 @@ (define-public heimdall
                (install-file "libpit/libpit.a" lib)
                #t))))))
     (inputs
-     (list libusb qtbase-5 qtwayland-5 zlib))
+     (list libusb qtbase qtwayland zlib))
+    (native-inputs (list pkg-config))
     (home-page "https://glassechidna.com.au/heimdall/")
     (synopsis "Flash firmware onto Samsung mobile devices")
     (description "@command{heimdall} is a tool suite used to flash firmware (aka

base-commit: 0c799ea004129c487a0aa8573d2e3e0839c84b2f
-- 
2.47.1

Message #8 received at 78578 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Herman Rimm <herman <at> rimm.ee>
Cc: 78578 <at> debbugs.gnu.org
Subject: Re: [bug#78578] [PATCH] gnu: heimdall: Update to 2.2.1.
Date: Mon, 26 May 2025 20:02:31 +0900

Hi,

Herman Rimm <herman <at> rimm.ee> writes:

> * gnu/packages/flashing-tools.scm (heimdall): Update to 2.2.1.
> [source]: Fetch from https://git.sr.ht/~grimler/Heimdall.
> [inputs]: Update qtbase-5 to qtbase, qtwayland-5 to qtwayland.
> [native-inputs]: Add pkg-config.
>
> Change-Id: I2b99926626b553f9f5ef50e62ae559174f9873ab
> ---
>  gnu/packages/flashing-tools.scm | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
> index e99a38ec2d7..ea112b3ffab 100644
> --- a/gnu/packages/flashing-tools.scm
> +++ b/gnu/packages/flashing-tools.scm
> @@ -344,16 +344,16 @@ (define-public rkflashtool
>  (define-public heimdall
>    (package
>      (name "heimdall")
> -    (version "1.4.2")
> +    (version "2.2.1")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> -                     (url "https://gitlab.com/BenjaminDobell/Heimdall.git")
> +                     (url "https://git.sr.ht/~grimler/Heimdall")
>                       (commit (string-append "v" version))))
>                (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz"))))
> +                "08sxn48jljrcily77g8yj89rhzwk0gjrz9lkglgrwl587x6q7sf7"))))
>      (build-system qt-build-system)
>      (arguments
>       `(#:build-type "Release"
> @@ -377,7 +377,8 @@ (define-public heimdall
>                 (install-file "libpit/libpit.a" lib)
>                 #t))))))
>      (inputs
> -     (list libusb qtbase-5 qtwayland-5 zlib))
> +     (list libusb qtbase qtwayland zlib))
> +    (native-inputs (list pkg-config))

It's a bit silly, but you need to use the #:qtbase argument and give it
'qtbase' (version 6) to ensure it doesn't add an implicit qtbase-5 in
there, and for the correct wrapping to happen.  The default is still
qtbase-5.

Could you send a v2?

-- 
Thanks,
Maxim

Message #11 received at 78578 <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: 78578 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: heimdall: Update to 2.2.1.
Date: Mon, 26 May 2025 18:52:34 +0200

* gnu/packages/flashing-tools.scm (heimdall): Update to 2.2.1.
[source]: Fetch from https://git.sr.ht/~grimler/Heimdall.
[arguments]: Set #:qtbase.
[inputs]: Remove qtbase-5.  Upgrade qtwayland-5 to qtwayland.
[native-inputs]: Add pkg-config.

Change-Id: I2b99926626b553f9f5ef50e62ae559174f9873ab
---
 gnu/packages/flashing-tools.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index e99a38ec2d7..2ea3fcdd1f6 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -344,19 +344,20 @@ (define-public rkflashtool
 (define-public heimdall
   (package
     (name "heimdall")
-    (version "1.4.2")
+    (version "2.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://gitlab.com/BenjaminDobell/Heimdall.git")
+                     (url "https://git.sr.ht/~grimler/Heimdall")
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz"))))
+                "08sxn48jljrcily77g8yj89rhzwk0gjrz9lkglgrwl587x6q7sf7"))))
     (build-system qt-build-system)
     (arguments
      `(#:build-type "Release"
+       #:qtbase ,qtbase
        #:tests? #f                      ; no tests
        #:phases
        (modify-phases %standard-phases
@@ -377,7 +378,8 @@ (define-public heimdall
                (install-file "libpit/libpit.a" lib)
                #t))))))
     (inputs
-     (list libusb qtbase-5 qtwayland-5 zlib))
+     (list libusb qtwayland zlib))
+    (native-inputs (list pkg-config))
     (home-page "https://glassechidna.com.au/heimdall/")
     (synopsis "Flash firmware onto Samsung mobile devices")
     (description "@command{heimdall} is a tool suite used to flash firmware (aka

base-commit: 127f232d1dce05bb843d28bf9501fd2b7c2e64de
-- 
2.47.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.