From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp10.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms5.migadu.com with LMTPS
	id cLvMEVUb52Mu+wAAbAwnHQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 11 Feb 2023 05:36:37 +0100
Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp10.migadu.com with LMTPS
	id 4E7oEFUb52NfeAEAG6o9tA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 11 Feb 2023 05:36:37 +0100
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id B9EEB2E3C
	for <larch@yhetil.org>; Sat, 11 Feb 2023 05:36:36 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1pQhcL-0007oq-WC; Fri, 10 Feb 2023 23:36:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1pQhcK-0007oZ-Ly
 for guix-patches@gnu.org; Fri, 10 Feb 2023 23:36:04 -0500
Received: from debbugs.gnu.org ([209.51.188.43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1pQhcH-0004IS-Sn
 for guix-patches@gnu.org; Fri, 10 Feb 2023 23:36:04 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1pQhcH-0003L5-Je; Fri, 10 Feb 2023 23:36:01 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#61397] [PATCH v2] gnu: hyfetch: Update to 1.4.6.
Resent-From: Hilton Chain <hako@ultrarare.space>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org
Resent-Date: Sat, 11 Feb 2023 04:36:01 +0000
Resent-Message-ID: <handler.61397.B61397.167609015812825@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 61397
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 61397@debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler@gmail.com>
X-Debbugs-Original-Xcc: Liliana Marie Prikler <liliana.prikler@gmail.com>
Received: via spool by 61397-submit@debbugs.gnu.org id=B61397.167609015812825
 (code B ref 61397); Sat, 11 Feb 2023 04:36:01 +0000
Received: (at 61397) by debbugs.gnu.org; 11 Feb 2023 04:35:58 +0000
Received: from localhost ([127.0.0.1]:38468 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1pQhcD-0003Kl-6z
 for submit@debbugs.gnu.org; Fri, 10 Feb 2023 23:35:57 -0500
Received: from mail.boiledscript.com ([144.168.59.46]:42830)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <hako@ultrarare.space>) id 1pQhc8-0003KT-IP
 for 61397@debbugs.gnu.org; Fri, 10 Feb 2023 23:35:55 -0500
Date: Sat, 11 Feb 2023 12:34:51 +0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space;
 s=dkim; t=1676090143;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=Ye2SmU7WEB81ZSJbPd4VFxrCc1L500f+CMa7U0KZ1rE=;
 b=dF8r9KGRbksfxH8I5CBwgiKgLKF6ihx3fbdDOvTx6kZe/yPROU8//k2rTA/vHYoBG5d9rK
 XQGE6G88Rqs78lD+MqsByy06cx4qUmtdS1Buxj8cGUwY8JDd/07pPvKF7Jp/8ynHiXQLTU
 12QB9y0FshJQcy7RyNp8hf4aWkGWMQgs9wD0+nuf3ncfIj4PeXN4yc4j/+I0XmJo1p0nCo
 s1O1humJAo4sHQcpWil+dHQ3trGlo88cVgtH8LHXapm12CfacqF3BKdqrd31wWXc4cXRz+
 Y2Xzu3FbNtD7BTsq/BmcxGETbLIzvZA4nP7LRpRUNyBg4hoY6VwC63x1zSBptw==
Message-ID: <87o7q0akgk.wl-hako@ultrarare.space>
In-Reply-To: <6768fcaeaf0e16053fcdcd696ec8d410c29bd946.camel@gmail.com>
References: <874jru11lv.wl-hako@ultrarare.space>
 <6768fcaeaf0e16053fcdcd696ec8d410c29bd946.camel@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-Spamd-Bar: /
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Reply-to:  Hilton Chain <hako@ultrarare.space>
X-ACL-Warn: ,  Hilton Chain via Guix-patches <guix-patches@gnu.org>
From:  Hilton Chain via Guix-patches via <guix-patches@gnu.org>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Country: US
X-Migadu-Flow: FLOW_IN
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1676090197;
	h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:resent-cc:resent-from:resent-sender:
	 resent-message-id:in-reply-to:in-reply-to:references:references:
	 list-id:list-help:list-unsubscribe:list-subscribe:list-post:
	 dkim-signature; bh=Ye2SmU7WEB81ZSJbPd4VFxrCc1L500f+CMa7U0KZ1rE=;
	b=gZ+/spK2noAe+B3FTOLL4MAFPBNdkhHFBzL23xcQ3CrllgCLv5OzvAvYgZiGgyP+58NYcq
	NCBkcbIQ5nG90OR5znZBRj/DdO6Crd5KjuHo1czS3N3OBEuwK4LRwNvZznvfRtQ/qnXm04
	WI5/+xyiVJ5LBUqvbpBD8pp9X2+abjOEUADk7tZWEqbDapr0iewuOZzN9nYRIHexqTZC/6
	KJ021jGs4/Bm/6NONCjEisWixYvTKhKztBcGrDsAG/ud0/qT2Tcwfpi47OLrSuRklECBd5
	raLTQAKdf6WOLJ/U+wy3Xf+z4m+tkFrTRvKPnYOvCPXpjF/f1X1YiC3gB/hS+A==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dF8r9KGR;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676090197; a=rsa-sha256; cv=none;
	b=SUEb56FVI8Xrp+Y1yOycaOzWdLO0IvD8hkEysdJsiQqOiiIL+yEnwXZdaosPmHKZEHA5Ei
	z4ONdwspiAaYDThHi+PcLKc9kMxTXgu2XCsYbidxnjdMX8Lf7/efk4Z5Pjz2MHzgHE5gkZ
	nOU++UbkM3TRd8TUWYd2/m7kDLs9aUxQCZu50qU85UGERv8GzfGqX+MGTOL2Mvf4VndaF1
	lkYW283wPmsHLD7DHDl33MIrpatczAlMmC8DuOR8roP04YT7kOgqmnP/5OhOwEDWLHi4tq
	oTH3JuZbL/zzw+KcaVwdb4DSzYLtMZXYvRjds8rkibe6DFRBFnGQmOJWzX7rIQ==
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dF8r9KGR;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Spam-Score: -3.60
X-Spam-Score: -3.60
X-Migadu-Queue-Id: B9EEB2E3C
X-Migadu-Scanner: scn1.migadu.com
X-TUID: 6NBJ+JXbqghz


* gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch:
New file.
* gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/admin.scm (hyfetch)[source]: Update to 1.4.6.
Switch to git source and add patches.
[inputs]: Remove python-hypy-utils.
[arguments]<#:phases>: Remove set-HOME phase.
---
 gnu/local.mk                                  |   2 +
 gnu/packages/admin.scm                        |  27 ++--
 ...-generator-script-quotation-escaping.patch | 115 ++++++++++++++++++
 .../hyfetch-remove-old-catchy-os-py.patch     |  48 ++++++++
 4 files changed, 181 insertions(+), 11 deletions(-)
 create mode 100644 gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch
 create mode 100644 gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b432a95026..f51b5a7e03 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1321,6 +1321,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/hurd-cross.patch				\
   %D%/packages/patches/hurd-xattr.patch				\
   %D%/packages/patches/hwloc-1-test-btrfs.patch			\
+  %D%/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch	\
+  %D%/packages/patches/hyfetch-remove-old-catchy-os-py.patch	\
   %D%/packages/patches/i7z-gcc-10.patch				\
   %D%/packages/patches/icecat-makeicecat.patch			\
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9a82740eb6..4833105eed 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3922,19 +3922,24 @@ (define-public neofetch
 (define-public hyfetch
   (package
     (name "hyfetch")
-    (version "1.4.4")
+    (version "1.4.6")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "HyFetch" version))
-        (sha256
-          (base32 "1k3pcl16y2czkk7wd79yk0w1kqpi4fp8h8szhjs5ywwy20nqmms8"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hykilpikonna/hyfetch")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (patches
+        (search-patches
+         ;; XXX: Cherry-picked from upstream, remove when updating.
+         "hyfetch-fix-generator-script-quotation-escaping.patch"
+         "hyfetch-remove-old-catchy-os-py.patch"))
+       (sha256
+        (base32
+         "1cnjvkil40bipia8gvs32q0lbqyi5j0nrsr7k4s0c55rh5bhkc3d"))))
     (build-system python-build-system)
-    (inputs (list python-hypy-utils python-typing-extensions))
-    (arguments `(#:phases (modify-phases %standard-phases
-                            (add-before 'build 'set-HOME
-                              (lambda _  ;; Tries to set files in .config
-                                (setenv "HOME" "/tmp"))))))
+    (inputs (list python-typing-extensions))
     (home-page "https://github.com/hykilpikonna/HyFetch")
     (synopsis "@code{neofetch} with pride flags <3")
     (description "HyFetch is a command-line system information tool fork of
diff --git a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch
new file mode 100644
index 0000000000..dc09864707
--- /dev/null
+++ b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch
@@ -0,0 +1,115 @@
+From db69285ec161452c11ae490266e84211bec38c0d Mon Sep 17 00:00:00 2001
+From: Azalea Gui <me@hydev.org>
+Date: Fri, 10 Feb 2023 23:05:23 -0500
+Subject: [PATCH] [F] Fix generator script quotation escaping #91 #90
+
+---
+ hyfetch/distros/debian.py   | 4 ++--
+ hyfetch/distros/haiku.py    | 2 +-
+ hyfetch/distros/puffos.py   | 2 +-
+ hyfetch/distros/skiffos.py  | 2 +-
+ hyfetch/distros/trisquel.py | 4 ++--
+ tools/list_distros.py       | 4 +++-
+ 6 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/hyfetch/distros/debian.py b/hyfetch/distros/debian.py
+index 8aab161d..7b4a2a9c 100644
+--- a/hyfetch/distros/debian.py
++++ b/hyfetch/distros/debian.py
+@@ -4,7 +4,7 @@ from . import AsciiArt
+ debian = AsciiArt(match=r'''"Debian"*''', color='1 7 3', ascii=r"""
+ ${c2}       _,met$$$$$gg.
+     ,g$$$$$$$$$$$$$$$P.
+-  ,g$$P"        \"""Y$$.".
++  ,g$$P"        "\""Y$$.".
+  ,$$P'              `$$$.
+ ',$$P       ,ggs.     `$$b:
+ `d$$'     ,$P"'   ${c1}.${c2}    $$$
+@@ -18,6 +18,6 @@ ${c2}  `Y$$
+      `$$b.
+        `Y$$b.
+           `"Y$b._
+-              `\"""
++              `"\""
+ """)
+     
+\ No newline at end of file
+diff --git a/hyfetch/distros/haiku.py b/hyfetch/distros/haiku.py
+index cf10cfc5..198cd142 100644
+--- a/hyfetch/distros/haiku.py
++++ b/hyfetch/distros/haiku.py
+@@ -15,6 +15,6 @@ ${c3}           MMMM${c4}   .cOMMMMM|/MMMMM/`
+            MM${c4}MMMMMMM/`:MMM/  ${c3}MMMM
+            MMMM              MMMM
+            MMMM              MMMM
+-           \""""              \""""
++           "\"\""              "\"\""
+ """)
+     
+\ No newline at end of file
+diff --git a/hyfetch/distros/puffos.py b/hyfetch/distros/puffos.py
+index 789d3994..0e61def4 100644
+--- a/hyfetch/distros/puffos.py
++++ b/hyfetch/distros/puffos.py
+@@ -7,7 +7,7 @@ ${c1}
+             ,/'      '"";
+            /             ".
+          ,'mmmMMMMmm.      \
+-       _/-"^^^^^\"""%#%mm,   ;
++       _/-"^^^^^"\""%#%mm,   ;
+  ,m,_,'              "###)  ;,
+ (###%                 \#/  ;##mm.
+  ^#/  __        ___    ;  (######)
+diff --git a/hyfetch/distros/skiffos.py b/hyfetch/distros/skiffos.py
+index 49d311c0..93a846a7 100644
+--- a/hyfetch/distros/skiffos.py
++++ b/hyfetch/distros/skiffos.py
+@@ -11,6 +11,6 @@ ${c2}
+       ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==,
+         ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}||
+             ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@
+-                   ${c1}````'\"""\""""${c2}'\"""\"""""
++                   ${c1}````'"\"\""\"\""${c2}'"\"\""\"\"\""
+ """)
+     
+\ No newline at end of file
+diff --git a/hyfetch/distros/trisquel.py b/hyfetch/distros/trisquel.py
+index c92a5938..b15eb1f4 100644
+--- a/hyfetch/distros/trisquel.py
++++ b/hyfetch/distros/trisquel.py
+@@ -3,7 +3,7 @@ from . import AsciiArt
+ 
+ trisquel = AsciiArt(match=r'''"Trisquel"*''', color='4 6', ascii=r"""
+ ${c1}                         ,o$$$o.
+-                      ,o$$Y\"""Y$$b
++                      ,o$$Y"\""Y$$b
+     ,o$$$$$$o.       ,$$'   ,   Y$$b
+  ,o$$$$$$$$$$$$o.    :$      b   Y$$.
+ ,$$"'      "Y$$$$o.   'b.   ,b  d$$$
+@@ -11,7 +11,7 @@ $$'  .d$$$$b  '$$$$o   'Y$$$Y  d$$$'
+ $$'  q'    'b  '$$$$$o._   _.o$$$$'
+ .$$,_    _,d$  ,$$$$$$$$$$$$${c2}$$$$Y'
+ ${c1} '$$$$aaa$$$' .$$$$$$${c2}$$$$$$$$'
+-${c1}     \""""     ${c2}d$$$$"'
++${c1}     "\"\""     ${c2}d$$$$"'
+              d$$$'   .d$$b.
+              $$$$  .$"   'a$.
+              $$$$  $b      $$.
+diff --git a/tools/list_distros.py b/tools/list_distros.py
+index d781b581..63fb5288 100755
+--- a/tools/list_distros.py
++++ b/tools/list_distros.py
+@@ -140,7 +140,9 @@ def export_distro(d: AsciiArt) -> str:
+         varname = varname.replace(s, '_')
+ 
+     # Escape/unescape ascii
+-    ascii = d.ascii.replace('"""', '\\"""').replace("\\\\", "\\")
++    ascii = d.ascii.replace("\\\\", "\\")
++    while '"""' in ascii:
++        ascii = ascii.replace('"""', '"\\""')
+ 
+     script = f"""
+ from . import AsciiArt
+-- 
+2.39.1
+
diff --git a/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch b/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch
new file mode 100644
index 0000000000..253730ce22
--- /dev/null
+++ b/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch
@@ -0,0 +1,48 @@
+From be475f02112e75a7ff72a594f75eb63b0a5ac29b Mon Sep 17 00:00:00 2001
+From: Azalea Gui <me@hydev.org>
+Date: Fri, 10 Feb 2023 23:25:16 -0500
+Subject: [PATCH] [-] Remove old catchy_os.py (Fixes #92)
+
+---
+ hyfetch/distros/cachy_os.py | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+ delete mode 100644 hyfetch/distros/cachy_os.py
+
+diff --git a/hyfetch/distros/cachy_os.py b/hyfetch/distros/cachy_os.py
+deleted file mode 100644
+index 75df6106..00000000
+--- a/hyfetch/distros/cachy_os.py
++++ /dev/null
+@@ -1,28 +0,0 @@
+-
+-from hyfetch.distro import AsciiArt
+-
+-cachy_os = AsciiArt(match=r'''"Cachy OS"*''', color='2 8 6', ascii=r"""
+-${c3}           ${c2}.${c3}-------------------------:
+-${c3}          .${c1}+=${c3}========================.
+-${c3}         :${c1}++${c3}===${c1}++===${c3}===============-       :${c1}++${c3}-
+-${c3}        :${c1}*++${c3}====${c1}+++++==${c3}===========-        .==:
+-${c3}       -${c1}*+++${c3}=====${c1}+***++=${c3}=========:
+-${c3}      =${c1}*++++=${c3}=======------------:
+-${c3}     =${c1}*+++++=${c3}====-                     ${c2}...${c3}
+-${c3}   .${c1}+*+++++${c3}=-===:                    .${c1}=+++=${c3}:
+-${c3}  :${c1}++++${c3}=====-==:                     -***${c1}**${c3}+
+-${c3} :${c1}++=${c3}=======-=.                      .=+**+${c2}.${c3}
+-${c3}.${c1}+${c3}==========-.                          ${c2}.${c3}
+-${c3} :${c1}+++++++${c3}====-                                ${c2}.${c3}--==-${c2}.${c3}
+-${c3}  :${c1}++${c3}==========.                             ${c2}:${c1}+++++++${c3}${c2}:
+-${c3}   .-===========.                            =*****+*+
+-${c3}    .-===========:                           .+*****+:
+-${c3}      -=======${c1}++++${c3}:::::::::::::::::::::::::-:  ${c2}.${c3}---:
+-${c3}       :======${c1}++++${c3}====${c1}+++******************=.
+-${c3}        :=====${c1}+++${c3}==========${c1}++++++++++++++*-
+-${c3}         .====${c1}++${c3}==============${c1}++++++++++*-
+-${c3}          .===${c1}+${c3}==================${c1}+++++++:
+-${c3}           .-=======================${c1}+++:
+-${c3}             ${c2}..........................
+-""")
+-    
+\ No newline at end of file
+-- 
+2.39.1
+

base-commit: 3ab8559436356ef89aa60135d3558681d64443ae
-- 
2.39.1