From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mI/KFw9eJGW+AAEAG6o9tA:P1 (envelope-from ) for ; Mon, 09 Oct 2023 22:09:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mI/KFw9eJGW+AAEAG6o9tA (envelope-from ) for ; Mon, 09 Oct 2023 22:09:51 +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 4D494306F5 for ; Mon, 9 Oct 2023 22:09:51 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696882191; 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=VxpV6frYbKqJu9JvQwZA0LBoscSTgUzYDu1uUB6/uvI=; b=EolJdOqg3mo03tT89u7dYJEOdEacrEjkTxL5HHEF5udBOeRGMA5CvJCvr+rKoI9wv5cGbh SbOTFEHvLNf4wwK3ADuUsgxmHFmyDCBr/umkgsgQ/r0i3SRalDefG8No4gdbalpyqJenAb Dqagim5v/VQyowp8kWp5/EleP8i1LCTxzsTrkaUCCHciIY4UwbPCRNszFkXvuoGLhc42rP EIPgUaiAvl24hcDhGDM6c7V87OYqILgUA4R5rzO8OttLZG5Bd2AjtNu+khRUV14oryXT9P zLYCps5uS+TIU6dK1EbrycX5uqMiU2aT/tE24nreLRXxASG1ERVs+hdMiZcg+Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696882191; a=rsa-sha256; cv=none; b=S7bahbTG+aq7e6PBLS3JRK7OSmQuFCT+DR6UsOcOcNT0PO4dVTLkApRRD2mswtw7M0kVKe wsOZAWNMGgbT5p51x9AS2WafgoDkLiUoLrgcFvinQx+jt6mgtFpzyIlytGn5oe68hIvBpd Tf9k/VE858EKVdsxCC7KecqF549knb5Y7EcgOG6cqUEaLtoi8wFDR6dAJLczcdMtpIEtlk FSFesBiCzxy3xAwU0eyJUd4Httxbba2eM8yD1/lz8yh/zhTH/KAIbhJW9UnECyJrK8lDuL Mrx+a+zzvzGGclFnNx9wd5Qk0NGuf9P8mTrGWPqgGT+Fay6JF8S5tqD/PeQvXQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYo-0006yd-4O; Mon, 09 Oct 2023 16:09:02 -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 1qpwYb-0006fB-0l for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:49 -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 1qpwYa-0008Bj-4K for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYu-0002dh-RA for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 34/63] gnu: git-crypt: Remove docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:08 +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.16968821189894 (code B ref 65479); Mon, 09 Oct 2023 20:09:08 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:38 +0000 Received: from localhost ([127.0.0.1]:33388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYP-0002ZK-Oy for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:38 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:55052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYI-0002YT-UW for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 30EED20D92 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:39 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 96157800A3; Mon, 9 Oct 2023 22:07:31 +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 DOFIDfoQJsHJ; Mon, 9 Oct 2023 22:07:29 +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 58B0D8009B; Mon, 9 Oct 2023 22:07:28 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:22 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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-Spam-Score: -5.19 X-Spam-Score: -5.19 X-Migadu-Queue-Id: 4D494306F5 X-Migadu-Scanner: mx2.migadu.com X-TUID: INh1+Fu5QRHO * 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 b0997db5da..cc6d9745a0 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 ;;; Copyright © 2023 Kjartan Oli Agustsson ;;; ;;; This file is part of GNU Guix. @@ -991,34 +992,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.41.0