From patchwork Sun Feb 19 07:51:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 47118 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC9AF16A12; Sun, 19 Feb 2023 07:52:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,WEIRD_QUOTING autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AEC8416A08 for ; Sun, 19 Feb 2023 07:52:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTeUS-0006yV-Jw; Sun, 19 Feb 2023 02:52:09 -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 ) id 1pTeUO-0006yD-1W for guix-patches@gnu.org; Sun, 19 Feb 2023 02:52: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 ) id 1pTeUM-00020d-VB for guix-patches@gnu.org; Sun, 19 Feb 2023 02:52:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTeUM-00036U-E0 for guix-patches@gnu.org; Sun, 19 Feb 2023 02:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61614] [PATCH] gnu: hyfetch: Update to 1.4.7. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Feb 2023 07:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61614 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61614@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167679310811904 (code B ref -1); Sun, 19 Feb 2023 07:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Feb 2023 07:51:48 +0000 Received: from localhost ([127.0.0.1]:45604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTeU8-00035v-1A for submit@debbugs.gnu.org; Sun, 19 Feb 2023 02:51:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:37780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTeU6-00035o-26 for submit@debbugs.gnu.org; Sun, 19 Feb 2023 02:51:46 -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 ) id 1pTeU5-0006xJ-F6 for guix-patches@gnu.org; Sun, 19 Feb 2023 02:51:45 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTeU2-0001vf-W4 for guix-patches@gnu.org; Sun, 19 Feb 2023 02:51:45 -0500 Date: Sun, 19 Feb 2023 15:51:30 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1676793097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=HVws7iv4vDuViqJlNYO+AJ2JAJ/yLW42i3QOgR6iaL8=; b=Owa/EhKgN9xd+d71toVpuS2CPo9BqAnxmbtV9AKYUOSq3JAmO1G7HBM6I7IKPgptzv6jJj tFEZ7rzehIKWL64Fkwgr1gC1t7q466Iwg+mp9iWqNAfGkdCtVE6M+1uiTWjZP4enkeDnGN UCwc9PKYhnjf6PZvGXOjrIwZwMubDbzgLvEM0tI/eLVp8KzujSEX5tLANSqrCZuEwrAVk/ 01fNrurx7N5+1qJueMRhGj4xvN51Zia0rPXKJojsljvp35RXuWnR5UNxNv7zqFRKSu19oG 7j8grVdPjHrSx2sy5rP75gawLHw/DLENVpXFMloHe4Zj26Q3zL8lxYJ2J7xacg== Message-ID: <87cz66um7x.wl-hako@ultrarare.space> MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (hyfetch): Update to 1.4.7. * gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch, * gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/admin.scm | 9 +- ...-generator-script-quotation-escaping.patch | 115 ------------------ .../hyfetch-remove-old-catchy-os-py.patch | 48 -------- 4 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch delete mode 100644 gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch base-commit: 877df1765ad8440c81293f4943d1f4f44485ba0f diff --git a/gnu/local.mk b/gnu/local.mk index f3d8dfcac6..5da09a8e79 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1325,8 +1325,6 @@ 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 b79621e279..9bd00d45e3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3915,7 +3915,7 @@ (define-public neofetch (define-public hyfetch (package (name "hyfetch") - (version "1.4.6") + (version "1.4.7") (source (origin (method git-fetch) @@ -3923,14 +3923,9 @@ (define-public hyfetch (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")))) + "1w0wzai73rr7iliii77f15ck5ki03xcvrhgzbp72nn7xcpix9wqd")))) (build-system python-build-system) (inputs (list python-typing-extensions)) (home-page "https://github.com/hykilpikonna/HyFetch") diff --git a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch deleted file mode 100644 index dc09864707..0000000000 --- a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch +++ /dev/null @@ -1,115 +0,0 @@ -From db69285ec161452c11ae490266e84211bec38c0d Mon Sep 17 00:00:00 2001 -From: Azalea Gui -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 deleted file mode 100644 index 253730ce22..0000000000 --- a/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch +++ /dev/null @@ -1,48 +0,0 @@ -From be475f02112e75a7ff72a594f75eb63b0a5ac29b Mon Sep 17 00:00:00 2001 -From: Azalea Gui -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 -