From 8877ba0533750c031fde28d45b3406429333bc96 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 18 Oct 2025 22:22:13 -0400 Subject: Use the offlineimap packaged in the standard channel --- .config/guix/modules/packages/graveyard/README.txt | 1 + .../packages/graveyard/offlineimap-patched.scm | 80 ++++++++++++++++++++++ .../guix/modules/packages/offlineimap-patched.scm | 80 ---------------------- .config/guix/modules/packages/packages.scm | 4 +- 4 files changed, 83 insertions(+), 82 deletions(-) create mode 100644 .config/guix/modules/packages/graveyard/README.txt create mode 100644 .config/guix/modules/packages/graveyard/offlineimap-patched.scm delete mode 100644 .config/guix/modules/packages/offlineimap-patched.scm diff --git a/.config/guix/modules/packages/graveyard/README.txt b/.config/guix/modules/packages/graveyard/README.txt new file mode 100644 index 0000000..a4e4c7f --- /dev/null +++ b/.config/guix/modules/packages/graveyard/README.txt @@ -0,0 +1 @@ +Packages in here no longer work, and for one reason or another I don't want to keep using them. diff --git a/.config/guix/modules/packages/graveyard/offlineimap-patched.scm b/.config/guix/modules/packages/graveyard/offlineimap-patched.scm new file mode 100644 index 0000000..df00bfd --- /dev/null +++ b/.config/guix/modules/packages/graveyard/offlineimap-patched.scm @@ -0,0 +1,80 @@ +(define-module (packages offlineimap-patched) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) + #:use-module (gnu packages documentation) + #:use-module (gnu packages mail) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix build-system python) + #:use-module (guix git-download) + #:export (offlineimap3-patched)) + +;;; Commentary: +;;; provides a fixed offlineimap package +;;; https://issues.guix.gnu.org/77952 +;;; Code: + +(define python-urllib3-1.25 + (package + (inherit python-urllib3) + (version "1.25.19") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urllib3" version)) + (sha256 + (base32 + "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h")))) + (native-inputs + (list python-setuptools + python-wheel)))) + +(define offlineimap3-patched + (let ((commit "db347452273bb0f1b1a8ea952f6fb46cf95fedbf") + (revision "0")) + (package + (name "offlineimap3") + (version (git-version "8.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OfflineIMAP/offlineimap3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0af6qxnjihpk29ns5i8545yj5spa0a0w85vrikaja768xc56wkrg")))) + (build-system python-build-system) + (native-inputs + (list asciidoc python-wheel)) + (inputs + (list python-distro python-imaplib2 python-rfc6555 python-urllib3-1.25)) + (arguments + `(;; Tests require a modifiable IMAP account. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-documentation + (lambda _ + (substitute* "docs/Makefile" + ;; Prevent xmllint and xsltproc from downloading a DTD file. + (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) + (invoke "make" "-C" "docs" "man"))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (install-file "docs/offlineimap.1" (string-append man "/man1")) + (install-file "docs/offlineimapui.7" (string-append man "/man7")))))))) + (home-page "https://www.offlineimap.org") + (synopsis "Sync emails between two repositories") + (description + "OfflineImap synchronizes emails between two repositories, so that you +can read the same mailbox from multiple computers. It supports IMAP as REMOTE +repository and Maildir/IMAP as LOCAL repository.") + (license license:gpl2+)))) diff --git a/.config/guix/modules/packages/offlineimap-patched.scm b/.config/guix/modules/packages/offlineimap-patched.scm deleted file mode 100644 index df00bfd..0000000 --- a/.config/guix/modules/packages/offlineimap-patched.scm +++ /dev/null @@ -1,80 +0,0 @@ -(define-module (packages offlineimap-patched) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages) - #:use-module (gnu packages python) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages python-web) - #:use-module (gnu packages documentation) - #:use-module (gnu packages mail) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix build-system python) - #:use-module (guix git-download) - #:export (offlineimap3-patched)) - -;;; Commentary: -;;; provides a fixed offlineimap package -;;; https://issues.guix.gnu.org/77952 -;;; Code: - -(define python-urllib3-1.25 - (package - (inherit python-urllib3) - (version "1.25.19") - (source - (origin - (method url-fetch) - (uri (pypi-uri "urllib3" version)) - (sha256 - (base32 - "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h")))) - (native-inputs - (list python-setuptools - python-wheel)))) - -(define offlineimap3-patched - (let ((commit "db347452273bb0f1b1a8ea952f6fb46cf95fedbf") - (revision "0")) - (package - (name "offlineimap3") - (version (git-version "8.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OfflineIMAP/offlineimap3") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0af6qxnjihpk29ns5i8545yj5spa0a0w85vrikaja768xc56wkrg")))) - (build-system python-build-system) - (native-inputs - (list asciidoc python-wheel)) - (inputs - (list python-distro python-imaplib2 python-rfc6555 python-urllib3-1.25)) - (arguments - `(;; Tests require a modifiable IMAP account. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-documentation - (lambda _ - (substitute* "docs/Makefile" - ;; Prevent xmllint and xsltproc from downloading a DTD file. - (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) - (invoke "make" "-C" "docs" "man"))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man"))) - (install-file "docs/offlineimap.1" (string-append man "/man1")) - (install-file "docs/offlineimapui.7" (string-append man "/man7")))))))) - (home-page "https://www.offlineimap.org") - (synopsis "Sync emails between two repositories") - (description - "OfflineImap synchronizes emails between two repositories, so that you -can read the same mailbox from multiple computers. It supports IMAP as REMOTE -repository and Maildir/IMAP as LOCAL repository.") - (license license:gpl2+)))) diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm index 04125ba..89f10b5 100644 --- a/.config/guix/modules/packages/packages.scm +++ b/.config/guix/modules/packages/packages.scm @@ -6,7 +6,6 @@ #:use-module (packages font-medieval-sharp) #:use-module (packages font-runa-mono) #:use-module (packages eww) - #:use-module (packages offlineimap-patched) #:use-module (packages bdwm) #:export (bd-packages-system bd-packages-laptop @@ -52,6 +51,7 @@ librewolf ;; librewolf linux ;; sysstat, tlp, alsa-plugins lisp ;; sbcl + mail ;; offlineimap man ;; man-pages networking ;; maccchanger package-management ;; stow @@ -184,7 +184,7 @@ jq nasm netcat - offlineimap3-patched + offlineimap3 pandoc pkg-config python -- cgit v1.2.3