amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: git-crypt: Remove docbook workarounds.

Browse source 
* gnu/packages/version-control.scm (git-crypt)[arguments]: Use G-Expressions.
<#:phases>: Refactored into …
<#:make-flags>: … here.
[native-inputs]: Add docbook-xml-4.2.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Bruno Victal 2023-10-09 21:06:22 +01:00 • committed by Ludovic Courtès
parent 75edbd4f1e
commit 653c40aedd
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/version-control.scm
View file

@ -48,6 +48,7 @@
;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev> ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2015, 2022 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2022 David Thompson <davet@gnu.org>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@disroot.org> ;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@disroot.org>
;;; Copyright © 2023 Steve George <steve@futurile.net> ;;; Copyright © 2023 Steve George <steve@futurile.net>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz> ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
@ -1225,34 +1226,20 @@ write native speed custom Git applications in any language with bindings.")
(inputs (inputs
(list git openssl)) (list git openssl))
(native-inputs (native-inputs
(list docbook-xsl libxslt)) (list docbook-xml-4.2 docbook-xsl libxslt))
(arguments (arguments
`(#:tests? #f ; No tests. (list
#:phases #:tests? #f ; No tests.
(modify-phases %standard-phases #:make-flags
(delete 'configure) #~(list
(add-after 'unpack 'patch-makefile "ENABLE_MAN=yes"
(lambda* (#:key inputs #:allow-other-keys) ;; Add flag to work around OpenSSL 3 incompatibility.
(substitute* "Makefile" ;; See <https://github.com/AGWA/git-crypt/issues/232>.
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") "CXXFLAGS+=-DOPENSSL_API_COMPAT=0x30000000L"
(string-append (assoc-ref inputs "docbook-xsl") (string-append "PREFIX=" #$output))
"/xml/xsl/docbook-xsl-" #:phases
,(package-version docbook-xsl) #~(modify-phases %standard-phases
"/manpages/docbook.xsl"))) (delete 'configure))))
#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))))))))
(home-page "https://www.agwa.name/projects/git-crypt/") (home-page "https://www.agwa.name/projects/git-crypt/")
(synopsis "Transparent encryption of files in a git repository") (synopsis "Transparent encryption of files in a git repository")
(description "git-crypt enables transparent encryption and decryption of (description "git-crypt enables transparent encryption and decryption of