From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GMjYAHGK5mS1+AAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cCXOAHGK5mRCbwAA9RJhRA (envelope-from ) for ; Thu, 24 Aug 2023 00:38:41 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9C1AF69E5D for ; Thu, 24 Aug 2023 00:38:40 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830320; a=rsa-sha256; cv=none; b=V+D5ek5FqypCRaCa1m22jXnuZ2HM9ZoLiDnVvLCLDUk/y8KjoEtB+LdNyQMTxNXDU4/71M lcgF2U0AXpsiCD4wFqCu4fOguoiSgsSWftLF1eQB54vdtvYR08onVuEMOAV0fdwjDo6VaQ QuIr6gwSZbz/wBVPdNF18vA733ir3TMF2mDSXa9AViRSXLx9gyRH6V2Rr7mm3kacijJ+AS WyDC8G1YI/fvTfhPcZrG2IzPFKo5l8idwV9W3gH5LguuTIKk0j7RtZp3qoGUGw6IVRStvv AfoYLYDGmWYrXcGZYbHC7C53g0ZSHWkkOVWqG+bE0uteC/tTsn3wjyjD0qsDiw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830320; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=QJ9Gp5grcN7zOOkhLOdUD4yI5JLo2zAql1lf8zKxSJE=; b=PuowuU70oQ2dRkGB2kVkIAcBw/AP+ahc96pRhaU0HcrAlOfJYaqmS3OYFzKW/VBet/Z+yO CN55CunCbKSQfQYE0z/vFgn6vQ4I1Zcb2dQv/C/4wl5aChtqL+Pc+9LEdJrnMYFkt9/nQ6 MhOTH69xNwF8wxCQEe2sDL3u8pUEngqV97skJwXFJu3NXVhxOK7CpAFAUXl5A/mNsvBiIq zmZ0mo88sJpd2D5XrCYT1/7p58W7PNFr93IO3EijOgtmAQ0MmLha+rox+XFMYi1VVpRTzz 9/nJVXbFya26Ha++SKCzOxtOGjml1quCEX3kYioEE9efBNrFqWL6BD8kNjGwaw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTZ-0008N4-Ef; Wed, 23 Aug 2023 18:37:21 -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 1qYwTO-0007rl-NB for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:10 -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 1qYwTO-0004yJ-F3 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTR-0004DT-W7 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:13 +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.169283022015913 (code B ref 65479); Wed, 23 Aug 2023 22:37:13 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:00 +0000 Received: from localhost ([127.0.0.1]:35404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTD-00048V-GV for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:59 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:43716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSf-00042D-Pj for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:26 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 975E920D31 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id CEABB800A1; Thu, 24 Aug 2023 00:36:17 +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 jbQUr8TJnamc; Thu, 24 Aug 2023 00:36:16 +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 CAA6080098; Thu, 24 Aug 2023 00:36:15 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:25 +0100 Message-Id: <475f054e21f72827383d83df85f03f92390d78f2.1692830150.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Spam-Score: -5.21 X-Migadu-Queue-Id: 9C1AF69E5D X-Migadu-Spam-Score: -5.21 X-TUID: 9eFf7J1igLpX * 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 ;;; Copyright © 2015, 2022 David Thompson ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Bruno Victal ;;; ;;; 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 . - (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 -- 2.40.1