From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QCA3HVVDKWdaQwAAe85BDQ:P1 (envelope-from ) for ; Mon, 04 Nov 2024 21:57:41 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QCA3HVVDKWdaQwAAe85BDQ (envelope-from ) for ; Mon, 04 Nov 2024 22:57:41 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Tu0uUZH4; 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=1730757461; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Yzf1dYuBFiy9LhWk85qLdl6sQUCaKCEqPXxCBIgzcdg=; b=ZcmKrYZVHtWDEFC/drbPlNx3EVhWEzgKmopvGD8k+kuXsEKU9FVkh9xMqp2IHeayYlduUH g/VTX9kV49rQjjhQGap3REwCsF3AuKXTjJMT0jp4LAykskJZ/L/zFgq3eQeKbqiqJXuTUz OdX3h+QcmQb1X5zQGeaJyhVBI93Ha2FXTnhOlmU/P9Gg/0nw8fwmJJb7RffYoko6HlqlIU JKacYdSYBo6/UQe9m97P3dLhKIqnqETqWmCU57AWsrsiYvrQb/MrqEyvlT8K20RYxi+6fH EuYPSf7ZgvLBZAbLapGLFVELfx0lRsUJrKOPZFUENzj+sqUcKsnxTV3nt9gG4A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730757461; a=rsa-sha256; cv=none; b=E8weiY6R5EveVh9ba2lH1jsZOwe8V2B1cjBjJzQImd3TgZGJrYng+6b+NKKteOEaXUycEd BSnQwK1rCPUY34bOYC3KvvNn24aLIQNXq3fL3A51TnT+ekSBO4J6CzBUixLBw1cXs7W09b 5VR1BaIV6fln3UaNsPpchYMKQoYZp2C91T5F9i6G6qAxPwnf1PL3BDQjBbBUCxdHBMfDtV Q4GQGK68N2z8dHyWSmFvPa2GKU2WLy5Mule9WdSr0HvGHVCGpmxsApyUyYTAHt+Jgj+9NG ugAJzdDy6JapIGebYQqg++hjDLzG1xJlXIXJMgTsH0tcbtoVYPzex9cHYizBtw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Tu0uUZH4; 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 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 C3E2C55476 for ; Mon, 04 Nov 2024 22:57:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t84bJ-0002Ot-Po; Mon, 04 Nov 2024 16:27:05 -0500 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 1t84bH-0002OS-Gq for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:03 -0500 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 1t84bH-0007Fe-8O for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Yzf1dYuBFiy9LhWk85qLdl6sQUCaKCEqPXxCBIgzcdg=; b=Tu0uUZH4uHji98EAdxQdO+uamuB77WOoUe53sZ+aso/p9HKpTPf37bplS0aPqv5PQw8TJu/D6G/RmH7V8iN37RH+cgcaN08FEFv7QvPzX4pXqZvES/tZqTjfGWGgc3VKh+ZxrreKWmUdxQbygL1WRGuWZypB2wI94PYF5VoiJLO/M1wnshOg1c8CwynDMaPfhX2GjkqZyLZ4OQfkgxHc88njVpljhcP/qgd70HJheqy54dwttKtFJXsw/X97y547KBrJqLgJRi04jGSMQ/v99lYBQyzV7b8jp0C2ac7ZRfcdVD2tUswsUrDM21nnHT2kPGPirS1l0Tk5mOGm6pXLaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t84bG-0001mH-Ne for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74206] [PATCH] gnu: Fix java-jaxen. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2024 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74206@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17307556006816 (code B ref -1); Mon, 04 Nov 2024 21:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2024 21:26:40 +0000 Received: from localhost ([127.0.0.1]:42441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t84au-0001ls-5w for submit@debbugs.gnu.org; Mon, 04 Nov 2024 16:26:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:39870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t84as-0001lm-Oq for submit@debbugs.gnu.org; Mon, 04 Nov 2024 16:26:39 -0500 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 1t84as-0002Ku-GP for guix-patches@gnu.org; Mon, 04 Nov 2024 16:26:38 -0500 Received: from mail02.noris.net ([62.128.1.232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t84ap-0007DS-HC for guix-patches@gnu.org; Mon, 04 Nov 2024 16:26:38 -0500 Received: from p57b098bb.dip0.t-ipconnect.de ([87.176.152.187] helo=hermia.goebel-consult.de) by mail02.noris.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) (envelope-from ) id 1t84ai-0006sj-R6 for guix-patches@gnu.org; Mon, 04 Nov 2024 22:26:28 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id EAA975F4DE; Mon, 4 Nov 2024 22:26:25 +0100 (CET) From: Hartmut Goebel Date: Mon, 4 Nov 2024 22:26:25 +0100 Message-ID: <5715f36b461fb1bd61966a21f7b69fc6049955a2.1730755471.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.41.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Noris-IP: 87.176.152.187 Received-SPF: pass client-ip=62.128.1.232; envelope-from=h.goebel@crazy-compilers.com; helo=mail02.noris.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: -3.06 X-Spam-Score: -3.06 X-Migadu-Queue-Id: C3E2C55476 X-Migadu-Scanner: mx13.migadu.com X-TUID: RT2kvzoo8K58 java-jaxen was missing the dom4j and xom sub-packages. This was caused by java-jaxen-bootstrap deleting the respective directories (which is okay) and java-javen not removing the phase that does this. Solve this by basing java-jaxen-bootstrap on java-jaxen instead of vice-versa. * gnu/packages/java-xml.scm (java-jaxen) Define based on former java-jaxen-bootstrap, while keeping the former's inputs and removing the later's build-phases. (java-jaxen-bootstrap): Inherit from java-jaxen, keeping the pre-existing bootstrap build-ohases and inputs. --- gnu/packages/java-xml.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 9ec11fa83e..09fdab8c0c 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -200,11 +200,9 @@ (define-public java-apache-xml-commons-resolver @end itemize") (license license:asl2.0))) -;; Jaxen requires java-dom4j and java-xom that in turn require jaxen. -;; This package is a bootstrap version without dependencies on dom4j and xom. -(define java-jaxen-bootstrap +(define-public java-jaxen (package - (name "java-jaxen-bootstrap") + (name "java-jaxen") (version "1.1.6") (source (origin (method url-fetch) @@ -218,16 +216,9 @@ (define java-jaxen-bootstrap (arguments `(#:jar-name "jaxen.jar" #:source-dir "src" - #:tests? #f; no tests - #:phases - (modify-phases %standard-phases - (add-before 'build 'remove-dom4j - (lambda _ - (delete-file-recursively "src/org/jaxen/dom4j") - (delete-file-recursively "src/org/jaxen/xom") - #t))))) + #:tests? #f)) ; no tests (inputs - `(("java-jdom" ,java-jdom))) + (list java-jdom java-xom java-dom4j)) (home-page "https://github.com/jaxen-xpath/jaxen") (synopsis "XPath library") (description "Jaxen is an XPath library written in Java. It is adaptable @@ -237,12 +228,23 @@ (define java-jaxen-bootstrap with XPath too.") (license license:bsd-3))) -(define-public java-jaxen +;; Jaxen requires java-dom4j and java-xom that in turn require jaxen. +;; This package is a bootstrap version without dependencies on dom4j and xom. +(define java-jaxen-bootstrap (package - (inherit java-jaxen-bootstrap) - (name "java-jaxen") + (inherit java-jaxen) + (name "java-jaxen-bootstrap") + (arguments + (substitute-keyword-arguments (package-arguments java-jaxen) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-before 'build 'remove-dom4j + (lambda _ + (delete-file-recursively "src/org/jaxen/dom4j") + (delete-file-recursively "src/org/jaxen/xom") + #t)))))) (inputs - (list java-jdom java-xom java-dom4j)))) + (list java-jdom)))) (define-public java-xom (package base-commit: 33665c52c4670bc3b4d337c89ac9cc6c4c69b26f -- 2.41.1