From 1b122676adf4532bc4c78cfd86d4eb7934ec289b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Tue, 28 Oct 2025 10:57:28 +0000
Subject: [PATCH] gnu: wfetch: Move to weather.

* gnu/packages/python-xyz.scm (wfetch): Move from here ...
* gnu/packages/weather.scm: ... to here.

Change-Id: I851f2a79768c80784ea54fa07a2862719ad8f781
---
 gnu/packages/python-xyz.scm | 51 -------------------------------
 gnu/packages/weather.scm    | 61 +++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index da6d9ff9b7..82bb0b9343 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17365,57 +17365,6 @@ structures.")
     (description "GPX file parser and GPS track manipulation library.")
     (license license:asl2.0)))
 
-(define-public wfetch
-  (let ((commit "e1cfa37814aebc9eb56ce994ebe877b6a6f9a715")
-        (revision "2"))
-    (package
-      (name "wfetch")
-      (version (git-version "0.1-pre" revision commit))
-      (home-page "https://github.com/Gcat101/Wfetch")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url home-page)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1dmr85plx8zr6s14ym3r32g6crwxghkval5a24ah90ijx4dbn5q5"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:tests? #f ;no test suite
-        #:phases
-        #~(modify-phases %standard-phases
-            (delete 'build)
-            (replace 'install
-              (lambda _
-                (let ((bin (string-append #$output "/bin"))
-                      (share (string-append #$output "/share")))
-                  (mkdir-p share)
-                  (substitute* "wfetch/wfetch.py"
-                    (("os.sep, 'opt', 'wfetch'")
-                     (string-append "'" share "'")))
-                  ;; The documentation expects the executable to be named
-                  ;; 'wfetch', not 'wfetch.py'.
-                  (rename-file "wfetch/wfetch.py" "wfetch/wfetch")
-                  (install-file "wfetch/wfetch" bin)
-                  (copy-recursively "wfetch/icons" share)))))))
-      (native-inputs (list python-setuptools))
-      (inputs (list python-pyowm python-fire python-termcolor python-requests))
-      (synopsis "Command-line tool to display weather info")
-      (description
-       "This package provides a tool similar to Neofetch/pfetch, but for
-weather: it can display the weather condition, temperature, humidity, etc.
-
-To use it, you must first run:
-
-@example
-export WEATHER_CLI_API=@var{your OpenWeatherMap API key}
-@end example
-")
-      (license license:gpl3+))))
-
 (define-public python-get-version
   (package
     (name "python-get-version")
diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm
index 6a89c65103..5fc1a367c5 100644
--- a/gnu/packages/weather.scm
+++ b/gnu/packages/weather.scm
@@ -1,6 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2024 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
+;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +31,8 @@
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages xml))
 
@@ -61,6 +66,62 @@ range---felt and measured---, wind speed and direction, viewing distance,
 precipitation amount and probability.")
     (license license:isc)))
 
+(define-public wfetch
+  (let ((commit "e1cfa37814aebc9eb56ce994ebe877b6a6f9a715")
+        (revision "2"))
+    (package
+      (name "wfetch")
+      (version (git-version "0.1-pre" revision commit))
+      (home-page "https://github.com/Gcat101/Wfetch")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1dmr85plx8zr6s14ym3r32g6crwxghkval5a24ah90ijx4dbn5q5"))))
+      (build-system pyproject-build-system)
+      (arguments
+       (list
+        #:tests? #f ;no test suite
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'build)
+            (replace 'install
+              (lambda _
+                (let ((bin (string-append #$output "/bin"))
+                      (share (string-append #$output "/share")))
+                  (mkdir-p share)
+                  (substitute* "wfetch/wfetch.py"
+                    (("os.sep, 'opt', 'wfetch'")
+                     (string-append "'" share "'")))
+                  ;; The documentation expects the executable to be named
+                  ;; 'wfetch', not 'wfetch.py'.
+                  (rename-file "wfetch/wfetch.py" "wfetch/wfetch")
+                  (install-file "wfetch/wfetch" bin)
+                  (copy-recursively "wfetch/icons" share)))))))
+      (native-inputs
+       (list python-setuptools))
+      (inputs
+       (list python-pyowm
+             python-fire
+             python-termcolor
+             python-requests))
+      (synopsis "Command-line tool to display weather info")
+      (description
+       "This package provides a tool similar to Neofetch/pfetch, but for
+weather: it can display the weather condition, temperature, humidity, etc.
+
+To use it, you must first run:
+
+@example
+export WEATHER_CLI_API=@var{your OpenWeatherMap API key}
+@end example
+")
+      (license license:gpl3+))))
+
 (define-public meteo-qt
   (package
     (name "meteo-qt")