guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 3aedd9a716614ed5d7c96008c8ac80782061a9e7
Author: Cayetano Santos <[email protected]>
AuthorDate: Fri Feb 27 14:03:21 2026 +0100
gnu: conky: Move to monitoring.
* gnu/packages/conky.scm: Remove.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister.
* po/packages/POTFILES.in: Unregister.
* gnu/packages/monitoring.scm (conky): Add variable.
Merges guix/guix!6738
Change-Id: I72a0f6e9b32d57f215cff59854222d6a5b2563cd
---
gnu/local.mk | 1 -
gnu/packages/conky.scm | 97 ---------------------------------------------
gnu/packages/monitoring.scm | 69 +++++++++++++++++++++++++++++++-
po/packages/POTFILES.in | 1 -
4 files changed, 68 insertions(+), 100 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 60892e32e7..d9f496ef3f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -208,7 +208,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/compression.scm \
%D%/packages/compton.scm \
%D%/packages/configuration-management.scm \
- %D%/packages/conky.scm \
%D%/packages/connman.scm \
%D%/packages/containers.scm \
%D%/packages/convmv.scm \
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm
deleted file mode 100644
index b0576cd137..0000000000
--- a/gnu/packages/conky.scm
+++ /dev/null
@@ -1,97 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Siniša Biđin <[email protected]>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2019 Pierre Neidhardt <[email protected]>
-;;; Copyright © 2019, 2023 Vasile Dumitrascu <[email protected]>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages conky)
- #:use-module (guix packages)
- #:use-module (guix utils)
- #:use-module (guix download)
- #:use-module (guix git-download)
- #:use-module (guix build-system cmake)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (gnu packages curl)
- #:use-module (gnu packages fontutils)
- #:use-module (gnu packages image)
- #:use-module (gnu packages linux)
- #:use-module (gnu packages lua)
- #:use-module (gnu packages ncurses)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages pulseaudio)
- #:use-module (gnu packages xorg))
-
-(define-public conky
- (package
- (name "conky")
- (home-page "https://github.com/brndnmtthws/conky";)
- (version "1.19.8")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1g712cw2nzd2qvgdmyvazyda0znyqzg6yckg98ss203fggwp93vj"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list "-DRELEASE=true"
- "-DBUILD_PULSEAUDIO=ON"
- "-DBUILD_WLAN=ON"
- "-DBUILD_TESTS=ON")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'add-freetype-to-search-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cmake/ConkyPlatformChecks.cmake"
- (("set\\(INCLUDE_SEARCH_PATH")
- (string-append
- "set(INCLUDE_SEARCH_PATH "
- (assoc-ref inputs "freetype") "/include/freetype2 ")))
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "src/conky" bin))
- #t)))))
- (inputs
- (list freetype
- imlib2
- libx11
- libxdamage
- libxext
- libxft
- libxi
- libxinerama
- pulseaudio
- lua
- ncurses
- curl
- wireless-tools))
- (native-inputs
- (list pkg-config))
- (synopsis "Lightweight system monitor for X")
- (description
- "Conky is a lightweight system monitor for X that displays operating
-system statistics (CPU, disk, and memory usage, etc.) and more on the
-desktop.")
- (license license:gpl3+)))
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 37ee759d0f..c5ddaa67c9 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016, 2021 Stefan Reichör <[email protected]>
;;; Copyright © 2018 Sou Bunnbu <[email protected]>
;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <[email protected]>
+;;; Copyright © 2018-2021 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018 Gábor Boskovits <[email protected]>
;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <[email protected]>
;;; Copyright © 2020 Alex ter Weele <[email protected]>
@@ -19,6 +19,9 @@
;;; Copyright © 2025 Nicolas Graves <[email protected]>
;;; Copyright © 2025 Giacomo Leidi <[email protected]>
;;; Copyright © 2025 Christian Birk Sørensen <[email protected]>
+;;; Copyright © 2015 Siniša Biđin <[email protected]>
+;;; Copyright © 2019 Pierre Neidhardt <[email protected]>
+;;; Copyright © 2019, 2023 Vasile Dumitrascu <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -42,6 +45,7 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system gnu)
@@ -57,6 +61,7 @@
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
#:use-module (gnu packages freedesktop) ; libatasmart
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages gd)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome) ;libnotify
@@ -66,6 +71,7 @@
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages image)
+ #:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
@@ -76,6 +82,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages prometheus)
#:use-module (gnu packages protobuf)
+ #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-science)
@@ -347,6 +354,66 @@ retrieval of all your quantified self data.")
@code{ActivityWatch}.")
(license license:mpl2.0))))
+(define-public conky
+ (package
+ (name "conky")
+ (home-page "https://github.com/brndnmtthws/conky";)
+ (version "1.19.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1g712cw2nzd2qvgdmyvazyda0znyqzg6yckg98ss203fggwp93vj"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "-DRELEASE=true"
+ "-DBUILD_PULSEAUDIO=ON"
+ "-DBUILD_WLAN=ON"
+ "-DBUILD_TESTS=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'add-freetype-to-search-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "cmake/ConkyPlatformChecks.cmake"
+ (("set\\(INCLUDE_SEARCH_PATH")
+ (string-append
+ "set(INCLUDE_SEARCH_PATH "
+ (assoc-ref inputs "freetype") "/include/freetype2 ")))
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "src/conky" bin))
+ #t)))))
+ (inputs
+ (list freetype
+ imlib2
+ libx11
+ libxdamage
+ libxext
+ libxft
+ libxi
+ libxinerama
+ pulseaudio
+ lua
+ ncurses
+ curl
+ wireless-tools))
+ (native-inputs
+ (list pkg-config))
+ (synopsis "Lightweight system monitor for X")
+ (description
+ "Conky is a lightweight system monitor for X that displays operating
+system statistics (CPU, disk, and memory usage, etc.) and more on the
+desktop.")
+ (license license:gpl3+)))
+
(define-public glances
(package
(name "glances")
diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in
index 68055e36c7..5402ce34bf 100644
--- a/po/packages/POTFILES.in
+++ b/po/packages/POTFILES.in
@@ -73,7 +73,6 @@ gnu/packages/commencement.scm
gnu/packages/compression.scm
gnu/packages/compton.scm
gnu/packages/configuration-management.scm
-gnu/packages/conky.scm
gnu/packages/connman.scm
gnu/packages/containers.scm
gnu/packages/convmv.scm
