ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-31 16:42:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: apostrophe: Update to 2.6.3.

Browse source 
* gnu/packages/gnome.scm (apostrophe): Update to 2.6.3.
[source]: Update URL.
[imported-modules, modules]: New arguments.
[phases]{python-and-gi-wrap}: Use search-input-file and site-packages.
[native-inputs]: Add bash-minimal.
[home-page]: Update URL.
This commit is contained in:
Maxim Cournoyer 2022-09-10 11:50:14 -04:00
parent 6eeb0f4eeb
commit 13a0224cd1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/gnome.scm
View file

@ -12309,44 +12309,43 @@ (define-public setzer
(define-public apostrophe (define-public apostrophe
(package (package
(name "apostrophe") (name "apostrophe")
(version "2.5") (version "2.6.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.gnome.org/somas/apostrophe") (url "https://gitlab.gnome.org/World/apostrophe")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp")))) "0wsvq2434p650cf3vq5w7a6czbk8in0ra7nji45mvwyfahdyn6j4"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t (list
#:meson ,meson-0.59 ;fails with 0.60 #:glib-or-gtk? #t
#:phases #:imported-modules `(,@%meson-build-system-modules
(modify-phases %standard-phases (guix build python-build-system))
(add-after 'unpack 'patch-meson #:modules '((guix build meson-build-system)
(lambda _ ((guix build python-build-system) #:prefix python:)
(substitute* "build-aux/meson_post_install.py" (guix build utils))
(("gtk-update-icon-cache") "true")))) #:phases
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap #~(modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (add-after 'unpack 'patch-meson
(let ((prog (string-append (assoc-ref outputs "out") (lambda _
"/bin/apostrophe")) (substitute* "build-aux/meson_post_install.py"
(pylib (string-append (assoc-ref outputs "out") (("gtk-update-icon-cache") "true"))))
"/lib/python" (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
,(version-major+minor (lambda* (#:key inputs outputs #:allow-other-keys)
(package-version (wrap-program (search-input-file outputs "bin/apostrophe")
(this-package-input "python"))) `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
"/site-packages"))) ,(python:site-packages inputs outputs)))
(wrap-program prog `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("PATH" prefix (,(dirname
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) (search-input-file inputs
`("PATH" prefix (,(dirname "/bin/pandoc"))))))))))
(search-input-file inputs
"/bin/pandoc")))))))))))
(inputs (inputs
(list glib (list bash-minimal
glib
gobject-introspection gobject-introspection
gspell gspell
gtk+ gtk+
@ -12366,7 +12365,7 @@ (define-public apostrophe
`(,glib "bin") `(,glib "bin")
pkg-config pkg-config
sassc)) sassc))
(home-page "https://gitlab.gnome.org/somas/apostrophe") (home-page "https://gitlab.gnome.org/World/apostrophe")
(synopsis "Markdown editor written in Python with GTK+") (synopsis "Markdown editor written in Python with GTK+")
(description "Apostrophe is a GTK+ based distraction-free Markdown editor. (description "Apostrophe is a GTK+ based distraction-free Markdown editor.
It uses pandoc as back-end for parsing Markdown.") It uses pandoc as back-end for parsing Markdown.")