[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook wo
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook workarounds. |
Date: |
Wed, 23 Aug 2023 23:35:25 +0100 |
* gnu/packages/version-control.scm (git-crypt)[arguments]: Use G-Expressions.
<#:phases>: Refactored into …
<#:make-flags>: … here.
[native-inputs]: Add docbook-xml-4.2.
---
gnu/packages/version-control.scm | 41 +++++++++++---------------------
1 file changed, 14 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 27be78b3ac..9342b68177 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -48,6 +48,7 @@
;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2015, 2022 David Thompson <davet@gnu.org>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -939,34 +940,20 @@ (define-public git-crypt
(inputs
(list git openssl))
(native-inputs
- (list docbook-xsl libxslt))
+ (list docbook-xml-4.2 docbook-xsl libxslt))
(arguments
- `(#:tests? #f ; No tests.
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'patch-makefile
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "Makefile"
-
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/manpages/docbook.xsl")))
- #t))
- (replace 'build
- (lambda _
- ;; Add flag to work around OpenSSL 3 incompatibility.
- ;; See <https://github.com/AGWA/git-crypt/issues/232>.
- (setenv "CXXFLAGS" "-DOPENSSL_API_COMPAT=0x30000000L")
-
- (invoke "make" "ENABLE_MAN=yes")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "make" "install"
- "ENABLE_MAN=yes"
- (string-append "PREFIX=" out))))))))
+ (list
+ #:tests? #f ; No tests.
+ #:make-flags
+ #~(list
+ "ENABLE_MAN=yes"
+ ;; Add flag to work around OpenSSL 3 incompatibility.
+ ;; See <https://github.com/AGWA/git-crypt/issues/232>.
+ "CXXFLAGS+=-DOPENSSL_API_COMPAT=0x30000000L"
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure))))
(home-page "https://www.agwa.name/projects/git-crypt/")
(synopsis "Transparent encryption of files in a git repository")
(description "git-crypt enables transparent encryption and decryption of
--
2.40.1
- [bug#65479] [PATCH core-updates 39/61] gnu: gnome-session: Remove libxml2., (continued)
- [bug#65479] [PATCH core-updates 39/61] gnu: gnome-session: Remove libxml2., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 16/61] gnu: dblatex: Split documentation., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 18/61] gnu: dblatex: Fix missing texlive binaries., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 21/61] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 23/61] gnu: gtk-doc: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 25/61] gnu: secilc: Drop xmlto workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 35/61] gnu: metapixel: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 46/61] gnu: libnotify: Drop docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 49/61] gnu: alsa-utils: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 29/61] gnu: udisks: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook workarounds.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates 32/61] gnu: gtk: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 20/61] gnu: docbook2x: Set search-paths for XML and SGML catalogs., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 17/61] gnu: Add docbook-mathml-1.0., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 38/61] gnu: libxkbcommon: Faux propagate libxml2., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 03/61] gnu: docbook-xml-5.1: Fix URIs in catalog.xml., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 42/61] gnu: drumstick: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 22/61] gnu: xmlto: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 30/61] gnu: colord-gtk: Build documentation., Bruno Victal, 2023/08/23