GNU bug report logs - #53431
[PATCH 0/3] gnu: ddcutil: Update to 1.2.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53431 in the body.
You can then email your comments to 53431 AT debbugs.gnu.org in the normal way.

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

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

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] gnu: ddcutil: Update to 1.2.1.
Date: Sat, 22 Jan 2022 00:13:16 +0100

This patchset supersedes <https://bugs.gnu.org/48984>.

Brice Waegeneire (3):
  gnu: i2c-tools: Update to 4.3.
  gnu: ddcutil: Update to 1.2.1.
  gnu: ddcui: Update to 0.2.0.

 gnu/packages/admin.scm    |  2 +-
 gnu/packages/hardware.scm | 12 +++++++-----
 gnu/packages/linux.scm    | 33 +++++++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 12 deletions(-)


base-commit: 98a322e02ef1d6c834fdb16a84162882245c0da2
-- 
2.34.0

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

From: Brice Waegeneire <brice <at> waegenei.re>
To: 53431 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: i2c-tools: Update to 4.3.
Date: Sat, 22 Jan 2022 00:23:06 +0100

* gnu/packages/linux.scm (i2c-tools): Update to 4.3.
  [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
  (i2c-tools-3): New variable.
* gnu/packages/admin.scm (novena-eeprom)[inputs]: Replace "i2c-tools" by
  "i2c-tools-3".
---
 gnu/packages/admin.scm |  2 +-
 gnu/packages/linux.scm | 33 +++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ed66e358ea..88e514b0c6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4753,7 +4753,7 @@ (define-public novena-eeprom
                (install-file "novena-eeprom" out-bin)
                (install-file "novena-eeprom.8" out-share-man)))))))
     (inputs
-     (list i2c-tools))
+     (list i2c-tools-3))
     (synopsis "Novena EEPROM editor")
     (description "This package provides an editor for the Novena EEPROM.
 Novena boards contain a device-dependent descriptive EEPROM that defines
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c044f2543d..e08eac1668 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -35,7 +35,7 @@
 ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen <at> yahoo.de>
 ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic <at> gmail.com>
-;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <brice <at> waegenei.re>
+;;; Copyright © 2019-2022 Brice Waegeneire <brice <at> waegenei.re>
 ;;; Copyright © 2019 Kei Kebreau <kkebreau <at> posteo.net>
 ;;; Copyright © 2020, 2021 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2020 Pierre Neidhardt <mail <at> ambrevar.xyz>
@@ -4430,21 +4430,22 @@ (define-public iucode-tool
 (define-public i2c-tools
   (package
     (name "i2c-tools")
-    (version "3.1.1")
+    (version "4.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
-                    version ".tar.bz2"))
+                    version ".tar.xz"))
               (sha256
                (base32
-                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
+                "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no 'check' target
        #:make-flags
-       ,#~(list (string-append "prefix=" #$output)
-                (string-append "CC=" #$(cc-for-target)))
+       ,#~(list (string-append "PREFIX=" #$output)
+                (string-append "CC=" #$(cc-for-target))
+                (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
        ;; No configure script.
        #:phases (modify-phases %standard-phases (delete 'configure))))
     (inputs
@@ -4458,6 +4459,26 @@ (define-public i2c-tools
 SMBus access.")
     (license license:gpl2+)))
 
+;; Needed for novena-eeprom
+(define-public i2c-tools-3
+  (package
+    (inherit i2c-tools)
+    (version "3.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
+    (arguments
+     `(#:make-flags
+       ,#~(list (string-append "prefix=" #$output)
+                (string-append "CC=" #$(cc-for-target)))
+       ,@(strip-keyword-arguments '(#:make-flags)
+                                  (package-arguments i2c-tools))))))
+
 (define-public xsensors
   (package
     (name "xsensors")
-- 
2.34.0

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 53431 <at> debbugs.gnu.org
Subject: Re: bug#53431: [PATCH 0/3] gnu: ddcutil: Update to 1.2.1.
Date: Fri, 21 Jan 2022 22:38:35 -0500

Hello Brice!

Brice Waegeneire <brice <at> waegenei.re> writes:

> * gnu/packages/linux.scm (i2c-tools): Update to 4.3.
>   [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
                        ^ the         ^ make flag

[...]

> @@ -4430,21 +4430,22 @@ (define-public iucode-tool
>  (define-public i2c-tools
>    (package
>      (name "i2c-tools")
> -    (version "3.1.1")
> +    (version "4.3")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
>                      "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
> -                    version ".tar.bz2"))
> +                    version ".tar.xz"))
>                (sha256
>                 (base32
> -                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
> +                "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f                      ; no 'check' target
>         #:make-flags
> -       ,#~(list (string-append "prefix=" #$output)
> -                (string-append "CC=" #$(cc-for-target)))
> +       ,#~(list (string-append "PREFIX=" #$output)
> +                (string-append "CC=" #$(cc-for-target))
> +                (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))

Why is this ld directive needed?  They don't use it in Nix, for
instance.  A comment would be helpful.

>         ;; No configure script.
>         #:phases (modify-phases %standard-phases (delete 'configure))))
>      (inputs
> @@ -4458,6 +4459,26 @@ (define-public i2c-tools
>  SMBus access.")
>      (license license:gpl2+)))

Looking at the Nix package definition, they do some other things that we
don't have, which we perhaps should:

--8<---------------cut here---------------start------------->8---
  postPatch = ''
    substituteInPlace eeprom/decode-edid \
      --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"

    substituteInPlace stub/i2c-stub-from-dump \
      --replace "/sbin/" ""
;--8<---------------cut here---------------end--------------->8---

They patch a reference to parse-edid and strip the '/sbin/' prefix from
some other place.

> +;; Needed for novena-eeprom
                              ^. (ending period)
> +(define-public i2c-tools-3
> +  (package
> +    (inherit i2c-tools)
> +    (version "3.1.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
> +                    version ".tar.bz2"))
> +              (sha256
> +               (base32
> +                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
> +    (arguments
> +     `(#:make-flags
> +       ,#~(list (string-append "prefix=" #$output)
> +                (string-append "CC=" #$(cc-for-target)))
> +       ,@(strip-keyword-arguments '(#:make-flags)
> +                                  (package-arguments i2c-tools))))))
> +
>  (define-public xsensors
>    (package
>      (name "xsensors")

The rest LGTM!

Thanks,

Maxim

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 53431 <at> debbugs.gnu.org
Subject: Re: bug#53431: [PATCH 0/3] gnu: ddcutil: Update to 1.2.1.
Date: Sat, 22 Jan 2022 21:35:15 -0500

Hi Brice,

Brice Waegeneire <brice <at> waegenei.re> writes:

> This patchset supersedes <https://bugs.gnu.org/48984>.
>
> Brice Waegeneire (3):
>   gnu: i2c-tools: Update to 4.3.
>   gnu: ddcutil: Update to 1.2.1.
>   gnu: ddcui: Update to 0.2.0.

It seems the patches for ddcutil and ddcui have yet to come.

Thanks,

Maxim

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

From: Brice Waegeneire <brice <at> waegenei.re>
To: 53431 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: ddcui: Update to 0.2.0.
Date: Sat, 12 Feb 2022 10:17:09 +0100

* gnu/packages/hardware.scm (ddcui): Update to 0.2.0.
---
 gnu/packages/hardware.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index e49dec49e0..f8c3cc5c57 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -226,7 +226,7 @@ (define-public ddcutil
 (define-public ddcui
   (package
     (name "ddcui")
-    (version "0.1.2")
+    (version "0.2.0")
     (source
      (origin
        (method git-fetch)
@@ -235,7 +235,7 @@ (define-public ddcui
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf"))))
+        (base32 "0da56w5yfmd4zx44gwzx1r0y0hwwicr69wxr434l78z9c7j877kn"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f))                    ; No test suite
-- 
2.34.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, 53431 <at> debbugs.gnu.org
Subject: Re: bug#53431: [PATCH 0/3] gnu: ddcutil: Update to 1.2.1.
Date: Sun, 06 Mar 2022 22:42:28 +0100

Hi Brice,

Did you have a chance to look into this for a v2?

  https://issues.guix.gnu.org/53431

Ludo’.

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> skribis:

> Hello Brice!
>
> Brice Waegeneire <brice <at> waegenei.re> writes:
>
>> * gnu/packages/linux.scm (i2c-tools): Update to 4.3.
>>   [arguments]: Up case "prefix" make-flag and add "LDFLAGS".
>                         ^ the         ^ make flag
>
> [...]
>
>> @@ -4430,21 +4430,22 @@ (define-public iucode-tool
>>  (define-public i2c-tools
>>    (package
>>      (name "i2c-tools")
>> -    (version "3.1.1")
>> +    (version "4.3")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append
>>                      "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
>> -                    version ".tar.bz2"))
>> +                    version ".tar.xz"))
>>                (sha256
>>                 (base32
>> -                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
>> +                "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
>>      (build-system gnu-build-system)
>>      (arguments
>>       `(#:tests? #f                      ; no 'check' target
>>         #:make-flags
>> -       ,#~(list (string-append "prefix=" #$output)
>> -                (string-append "CC=" #$(cc-for-target)))
>> +       ,#~(list (string-append "PREFIX=" #$output)
>> +                (string-append "CC=" #$(cc-for-target))
>> +                (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
>
> Why is this ld directive needed?  They don't use it in Nix, for
> instance.  A comment would be helpful.
>
>>         ;; No configure script.
>>         #:phases (modify-phases %standard-phases (delete 'configure))))
>>      (inputs
>> @@ -4458,6 +4459,26 @@ (define-public i2c-tools
>>  SMBus access.")
>>      (license license:gpl2+)))
>
> Looking at the Nix package definition, they do some other things that we
> don't have, which we perhaps should:
>
> --8<---------------cut here---------------start------------->8---
>   postPatch = ''
>     substituteInPlace eeprom/decode-edid \
>       --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
>
>     substituteInPlace stub/i2c-stub-from-dump \
>       --replace "/sbin/" ""
> ;--8<---------------cut here---------------end--------------->8---
>
> They patch a reference to parse-edid and strip the '/sbin/' prefix from
> some other place.
>
>> +;; Needed for novena-eeprom
>                               ^. (ending period)
>> +(define-public i2c-tools-3
>> +  (package
>> +    (inherit i2c-tools)
>> +    (version "3.1.1")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append
>> +                    "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
>> +                    version ".tar.bz2"))
>> +              (sha256
>> +               (base32
>> +                "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
>> +    (arguments
>> +     `(#:make-flags
>> +       ,#~(list (string-append "prefix=" #$output)
>> +                (string-append "CC=" #$(cc-for-target)))
>> +       ,@(strip-keyword-arguments '(#:make-flags)
>> +                                  (package-arguments i2c-tools))))))
>> +
>>  (define-public xsensors
>>    (package
>>      (name "xsensors")
>
> The rest LGTM!
>
> Thanks,
>
> Maxim

Message #25 received at 53431-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 53431-done <at> debbugs.gnu.org, Brice Waegeneire <brice <at> waegenei.re>
Subject: Re: bug#53431: [PATCH 0/3] gnu: ddcutil: Update to 1.2.1.
Date: Wed, 28 Sep 2022 15:26:14 -0400

Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi Brice,
>
> Did you have a chance to look into this for a v2?
>
>   https://issues.guix.gnu.org/53431

I see all components here are now at version past what was sent here,
thus I'm closing this ticket.

Thanks,

Maxim

Previous Next

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