From patchwork Sat Sep 23 14:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54205 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1185D27BBE2; Sat, 23 Sep 2023 15:24:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EFF627BBE9 for ; Sat, 23 Sep 2023 15:23:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3Y2-0000F1-LW; Sat, 23 Sep 2023 10:23:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qk3Y0-0000BX-75 for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qk3Xz-0003kp-Ub for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3YB-0008Bo-5J for guix-patches@gnu.org; Sat, 23 Sep 2023 10:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 33/62] gnu: git-crypt: Remove docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169547900331392 (code B ref 65479); Sat, 23 Sep 2023 14:24:03 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:23:23 +0000 Received: from localhost ([127.0.0.1]:40294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3XW-0008AA-FG for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:23:22 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3XA-00087T-Rt for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:23:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id AC9ED20DF3 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 2A60B80092; Sat, 23 Sep 2023 16:21:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id apDr4lKwgJvE; Sat, 23 Sep 2023 16:21:30 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5BE5D8009D; Sat, 23 Sep 2023 16:21:30 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:08 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 86dcea908c..9f9392fad1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2022 Dhruvin Gandhi ;;; Copyright © 2015, 2022 David Thompson ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -942,34 +943,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 . - (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 . + "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