diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/calendar.scm | 51 | ||||
| -rw-r--r-- | gnu/packages/gcal.scm | 77 |
3 files changed, 51 insertions, 78 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d57918171a4..e3964f85abb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -305,7 +305,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/game-development.scm \ %D%/packages/games.scm \ %D%/packages/gawk.scm \ - %D%/packages/gcal.scm \ %D%/packages/gcc.scm \ %D%/packages/gd.scm \ %D%/packages/gdb.scm \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index c4bb6bd5d4e..4430fe4a56b 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> @@ -16,6 +17,7 @@ ;;; Copyright © 2025 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se> +;;; Copyright © 2025 Andy Tai <atai@atai.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -488,6 +490,55 @@ traditional Chinese characters.") ;; 'Lesser GPL version 2 or later'. (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public gcal + (package + (name "gcal") + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.alteholz.dev/gnu/gcal-" + version ".tar.xz")) + (sha256 + (base32 + "1p3q6his31bxs24nsgpfavw3nlhalqf0zak4f3b530p725s2vgfq")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around <https://bugs.gnu.org/32347>. + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append + "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "LDFLAGS=-lm"))) + (native-inputs + (list check + pkg-config)) + (home-page "https://www.gnu.org/software/gcal/") + (synopsis "Calculating and printing a wide variety of calendars") + (description + "Gcal is a program to calculate and print calendars on the +command-line. Calendars can be printed in 1-month, 3-month or whole-year +views. In addition, eternal holiday lists can be generated for many +countries, which can be complemented by user-made lists of fixed dates to +make an agenda. Gcal can also calculate astronomical data, such as the +phases of the moon, and supports alternative calendar formats: Julian, +Gregorian, Islamic, Chinese and more.") + (license license:gpl3+))) + (define-public gsimplecal (let ((version "2.4.1")) (package diff --git a/gnu/packages/gcal.scm b/gnu/packages/gcal.scm deleted file mode 100644 index 099a21c0833..00000000000 --- a/gnu/packages/gcal.scm +++ /dev/null @@ -1,77 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2025 Andy Tai <atai@atai.org> -;;; -;;; 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 gcal) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages check) - #:use-module (gnu packages pkg-config) - #:use-module (guix build-system gnu) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix packages)) - - -(define-public gcal - (package - (name "gcal") - (version "4.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.alteholz.dev/gnu/gcal-" - version ".tar.xz")) - (sha256 - (base32 - "1p3q6his31bxs24nsgpfavw3nlhalqf0zak4f3b530p725s2vgfq")) - (snippet - #~(begin - (use-modules (guix build utils)) - ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. - ;; "m4-gnulib-libio.patch". This is a phase rather than patch - ;; or snippet to work around <https://bugs.gnu.org/32347>. - (substitute* (find-files "lib" "\\.c$") - (("#if defined _IO_ftrylockfile") - "#if defined _IO_EOF_SEEN")) - (substitute* "lib/stdio-impl.h" - (("^/\\* BSD stdio derived implementations") - (string-append - "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" - "# define _IO_IN_BACKUP 0x100\n" - "#endif\n\n" - "/* BSD stdio derived implementations"))) - #t)))) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags - #~(list "LDFLAGS=-lm"))) - (native-inputs - (list check - pkg-config)) - (home-page "https://www.gnu.org/software/gcal/") - (synopsis "Calculating and printing a wide variety of calendars") - (description - "Gcal is a program to calculate and print calendars on the -command-line. Calendars can be printed in 1-month, 3-month or whole-year -views. In addition, eternal holiday lists can be generated for many -countries, which can be complemented by user-made lists of fixed dates to -make an agenda. Gcal can also calculate astronomical data, such as the -phases of the moon, and supports alternative calendar formats: Julian, -Gregorian, Islamic, Chinese and more.") - (license license:gpl3+))) |