guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 66d71b93450a82f942e971f48e7d3590edf0e2a8
Author: Noé Lopez <[email protected]>
AuthorDate: Wed Dec 17 12:32:26 2025 +0100
gnu: apostrophe: Move to (gnu packages gnome-circle).
* gnu/packages/gnome-circle.scm (apostrophe): New variable.
* gnu/packages/gnome.scm (apostrophe): Replace with deprecated alias.
Change-Id: I55b1507ef189d9f2b34cfec596cdb40e873662f7
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/gnome-circle.scm | 87 ++++++++++++++++++++++++++++++++++++++++++-
gnu/packages/gnome.scm | 66 +-------------------------------
2 files changed, 88 insertions(+), 65 deletions(-)
diff --git a/gnu/packages/gnome-circle.scm b/gnu/packages/gnome-circle.scm
index d70e31a9aa..7804d9c1f0 100644
--- a/gnu/packages/gnome-circle.scm
+++ b/gnu/packages/gnome-circle.scm
@@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019-2025 Maxim Cournoyer <[email protected]>
+;;; Copyright © 2019-2022 Liliana Marie Prikler <[email protected]>
;;; Copyright © 2025 Noé Lopez <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -23,4 +25,87 @@
;;; Code:
-(define-module (gnu packages gnome-circle))
+(define-module (gnu packages gnome-circle)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages enchant)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages webkit)
+ #:use-module (guix build-system meson)
+ #:use-module (guix build-system python)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages))
+
+(define-public apostrophe
+ (package
+ (name "apostrophe")
+ (version "2.6.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/World/apostrophe";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wsvq2434p650cf3vq5w7a6czbk8in0ra7nji45mvwyfahdyn6j4"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:imported-modules `(,@%meson-build-system-modules
+ (guix build python-build-system))
+ #:modules '((guix build meson-build-system)
+ ((guix build python-build-system) #:prefix python:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "build-aux/meson_post_install.py"
+ (("gtk-update-icon-cache") "true"))))
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/apostrophe")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
+ ,(python:site-packages inputs outputs)))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
+ `("PATH" prefix (,(dirname
+ (search-input-file inputs
+ "/bin/pandoc"))))))))))
+ (inputs
+ (list bash-minimal
+ glib
+ gobject-introspection
+ gspell
+ gtk+
+ libhandy
+ pandoc
+ python
+ python-chardet
+ python-levenshtein
+ python-regex
+ python-pycairo
+ python-pygobject
+ python-pyenchant
+ python-pypandoc
+ webkitgtk-with-libsoup2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ pkg-config
+ sassc))
+ (home-page "https://gitlab.gnome.org/World/apostrophe";)
+ (synopsis "Markdown editor written in Python with GTK+")
+ (description "Apostrophe is a GTK+ based distraction-free Markdown editor.
+It uses pandoc as back-end for parsing Markdown.")
+ (license license:gpl3)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index edc8e3c5af..4089a08f0a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13195,70 +13195,8 @@ and toolbars.")
GTK+. It integrates well with the GNOME desktop environment.")
(license license:gpl3+)))
-(define-public apostrophe
- (package
- (name "apostrophe")
- (version "2.6.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.gnome.org/World/apostrophe";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0wsvq2434p650cf3vq5w7a6czbk8in0ra7nji45mvwyfahdyn6j4"))))
- (build-system meson-build-system)
- (arguments
- (list
- #:glib-or-gtk? #t
- #:imported-modules `(,@%meson-build-system-modules
- (guix build python-build-system))
- #:modules '((guix build meson-build-system)
- ((guix build python-build-system) #:prefix python:)
- (guix build utils))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-meson
- (lambda _
- (substitute* "build-aux/meson_post_install.py"
- (("gtk-update-icon-cache") "true"))))
- (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (search-input-file outputs "bin/apostrophe")
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
- ,(python:site-packages inputs outputs)))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
- `("PATH" prefix (,(dirname
- (search-input-file inputs
- "/bin/pandoc"))))))))))
- (inputs
- (list bash-minimal
- glib
- gobject-introspection
- gspell
- gtk+
- libhandy
- pandoc
- python
- python-chardet
- python-levenshtein
- python-regex
- python-pycairo
- python-pygobject
- python-pyenchant
- python-pypandoc
- webkitgtk-with-libsoup2))
- (native-inputs
- (list gettext-minimal
- `(,glib "bin")
- pkg-config
- sassc))
- (home-page "https://gitlab.gnome.org/World/apostrophe";)
- (synopsis "Markdown editor written in Python with GTK+")
- (description "Apostrophe is a GTK+ based distraction-free Markdown editor.
-It uses pandoc as back-end for parsing Markdown.")
- (license license:gpl3)))
+(define-deprecated/public-alias apostrophe
+ (@ (gnu packages gnome-circle) apostrophe))
(define-public libratbag
(package
