GNU bug report logs - #64305
[PATCH 0/4] Fixup uwufetch.

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 64305 in the body.
You can then email your comments to 64305 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: Juliana Sims <juli <at> incana.org>
To: guix-patches <at> gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH 0/4] Fixup uwufetch.
Date: Mon, 26 Jun 2023 13:10:43 -0400

Hello,

While doing a periodic check on updates to packages I've submitted to Guix, I noticed that there were some issues with uwufetch - namely, running `guix shell --pure uwufetch` left you with a broken package. This patch series takes care of that and fixes some other minor issues I noticed along the way.

Thanks,
Juli

Juliana Sims (4):
  gnu: uwufetch: Fix typo in build phase name.
  gnu: uwufetch: Manually create missing include dir.
  gnu: uwufetch: Add missing propagated inputs.
  gnu: uwufetch: Add supported-systems.

 gnu/packages/admin.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)


base-commit: 05a7f7bf6e30ca958a86c3853222d45e075459b0
-- 
2.40.1

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH 1/4] gnu: uwufetch: Fix typo in build phase name.
Date: Mon, 26 Jun 2023 13:14:04 -0400

* gnu/packages/admin.scm (uwufetch) [arguments]: Fix typo in build phase name.
---
 gnu/packages/admin.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index a81a3f3414..39d363272b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4020,7 +4020,7 @@ (define-public uwufetch
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
-          (add-before 'build 'path-source-paths
+          (add-before 'build 'patch-source-paths
             (lambda _
               (substitute* "uwufetch.c"
                 (("(/usr(/local)?)(.*;)" all _ _ rest)
-- 
2.40.1

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH 2/4] gnu: uwufetch: Manually create missing include dir.
Date: Mon, 26 Jun 2023 13:14:05 -0400

* gnu/packages/admin.scm (uwufetch) [arguments]: Manually create missing
include dir.
---
 gnu/packages/admin.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 39d363272b..0af0ef4051 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4024,7 +4024,11 @@ (define-public uwufetch
             (lambda _
               (substitute* "uwufetch.c"
                 (("(/usr(/local)?)(.*;)" all _ _ rest)
-                 (string-append #$output rest))))))))
+                 (string-append #$output rest)))))
+          ;; TODO this will be fixed in the next release of uwufetch
+          (add-before 'install 'make-include-dir
+            (lambda _
+              (mkdir-p (string-append #$output "/include")))))))
     (inputs (list lshw
                   ;; viu XXX not yet packaged in Guix
                   xwininfo))
-- 
2.40.1

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH 3/4] gnu: uwufetch: Add missing propagated inputs.
Date: Mon, 26 Jun 2023 13:14:06 -0400

* gnu/packages/admin.scm (uwufetch) [propagated-inputs]: Add missing
propagated inputs.
---
 gnu/packages/admin.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0af0ef4051..2c87976721 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4029,6 +4029,8 @@ (define-public uwufetch
           (add-before 'install 'make-include-dir
             (lambda _
               (mkdir-p (string-append #$output "/include")))))))
+    (propagated-inputs (list gawk
+                             grep))
     (inputs (list lshw
                   ;; viu XXX not yet packaged in Guix
                   xwininfo))
-- 
2.40.1

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Cc: Juliana Sims <juli <at> incana.org>
Subject: [PATCH 4/4] gnu: uwufetch: Add supported-systems.
Date: Mon, 26 Jun 2023 13:14:07 -0400

* gnu/packages/admin.scm (uwufetch): Add supported-systems.
---
 gnu/packages/admin.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2c87976721..1611b9f0a6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4042,7 +4042,13 @@ (define-public uwufetch
 well as a summary of system information.  UwUFetch's unique contribution is the
 uwu-ification of various words used in the description.  For example, Guix
 becomes gUwUix.")
-    (license license:gpl3+)))
+    (license license:gpl3+)
+    (supported-systems
+     (filter (lambda (sys)
+               (not (member sys (list "i586-gnu"
+                                      "mips64el-linux"
+                                      "powerpc-linux"))))
+             %supported-systems))))
 
 (define-public screenfetch
   (package
-- 
2.40.1

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Subject: Re: [PATCH 4/4] gnu: uwufetch: Add supported-systems.
Date: Thu, 27 Jul 2023 00:03:29 -0400

Hey,

Pinging this since it's been up a month.

Upon further investigation into the usage of supported-systems, I don't 
think the 4th patch is correct and it can therefore be disregarded.

Thanks,
Juli

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Juliana Sims <juli <at> incana.org>
Cc: 64305 <at> debbugs.gnu.org
Subject: Re: bug#64305: [PATCH 0/4] Fixup uwufetch.
Date: Tue, 08 Aug 2023 17:23:20 +0200

Hi!

Finally applied patches #1 and #2, thanks!

Juliana Sims <juli <at> incana.org> skribis:

> * gnu/packages/admin.scm (uwufetch) [propagated-inputs]: Add missing
> propagated inputs.

[...]

> +    (propagated-inputs (list gawk
> +                             grep))

This is somewhat intrusive as installing uwufetch would now pull in
these two packages in the user’s profile.

Could we address the problem differently, for instance by changing a
mere reference to “gawk” to “/gnu/store/…/bin/gawk” in the source?

TIA,
Ludo’.

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

From: Juliana Sims <juli <at> incana.org>
To: 64305 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH] gnu: uwufetch: Add and use missing inputs.
Date: Wed,  9 Aug 2023 22:37:16 -0400

Hi there,

Oops! I sent that last email wrong!

For Ludovic: this is the same as that other email, but I want to make sure
everything is threaded and catalogued properly.

For everyone else: this patch takes Ludovic's advice and substitutes references
to "grep" and "awk" in the uwufetch source code with references to the
fully-qualified paths of those binaries. It adds them as regular inputs rather
than the propagated inputs the previous version of this patch added them as.

Thanks,
Juli

* gnu/packages/admin.scm (uwufetch) [inputs]: Add missing inputs.
[phases]: Use the fully-qualified paths of the input gawk and grep.
---
 gnu/packages/admin.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 33f9b703a7..6b6b05c4a0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4025,6 +4025,11 @@ (define-public uwufetch
           (delete 'configure)
           (add-before 'build 'patch-source-paths
             (lambda _
+              (substitute* "fetch.c"
+                (("grep")
+                 #$(file-append grep "/bin/grep"))
+                (("awk")
+                 #$(file-append gawk "/bin/awk")))
               (substitute* "uwufetch.c"
                 (("(/usr(/local)?)(.*;)" all _ _ rest)
                  (string-append #$output rest)))))
@@ -4033,6 +4038,8 @@ (define-public uwufetch
             (lambda _
               (mkdir-p (string-append #$output "/include")))))))
     (inputs (list lshw
+                  gawk
+                  grep
                   ;; viu XXX not yet packaged in Guix
                   xwininfo))
     (home-page "https://github.com/TheDarkBug/uwufetch")

base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035
-- 
2.41.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Juliana Sims <juli <at> incana.org>
Cc: 64305-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: uwufetch: Add and use missing inputs.
Date: Sat, 12 Aug 2023 22:36:28 +0200

Hi,

Juliana Sims <juli <at> incana.org> skribis:

> Hi there,
>
> Oops! I sent that last email wrong!
>
> For Ludovic: this is the same as that other email, but I want to make sure
> everything is threaded and catalogued properly.
>
> For everyone else: this patch takes Ludovic's advice and substitutes references
> to "grep" and "awk" in the uwufetch source code with references to the
> fully-qualified paths of those binaries. It adds them as regular inputs rather
> than the propagated inputs the previous version of this patch added them as.
>
> Thanks,
> Juli
>
> * gnu/packages/admin.scm (uwufetch) [inputs]: Add missing inputs.
> [phases]: Use the fully-qualified paths of the input gawk and grep.

Perfect, thank you!

Ludo’.

Previous Next

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