From 064d3310689754a8846a6e67cb27e6d985232f70 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 19 Feb 2023 15:51:30 +0800 Subject: gnu: hyfetch: Update to 1.4.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/admin.scm | 9 +- ...h-fix-generator-script-quotation-escaping.patch | 115 --------------------- .../patches/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 diff --git a/gnu/local.mk b/gnu/local.mk index 4ccf015316..dd1d546be5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1326,8 +1326,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 35a0162f02..e0d2147eb3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3918,7 +3918,7 @@ you are running, what theme or icon set you are using, etc.") (define-public hyfetch (package (name "hyfetch") - (version "1.4.6") + (version "1.4.7") (source (origin (method git-fetch) @@ -3926,14 +3926,9 @@ you are running, what theme or icon set you are using, etc.") (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 - -- cgit v1.2.3