From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mEfDL5xWH2M3WQEAbAwnHQ (envelope-from ) for ; Mon, 12 Sep 2022 17:56:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OIOSL5xWH2PLVwEA9RJhRA (envelope-from ) for ; Mon, 12 Sep 2022 17:56:12 +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 4272DABE2 for ; Mon, 12 Sep 2022 17:56:12 +0200 (CEST) Received: from localhost ([::1]:35690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXln9-0005BU-A4 for larch@yhetil.org; Mon, 12 Sep 2022 11:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXln1-0005B9-GV for bug-guix@gnu.org; Mon, 12 Sep 2022 11:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXln0-00085L-AH for bug-guix@gnu.org; Mon, 12 Sep 2022 11:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXln0-0002xX-3g for bug-guix@gnu.org; Mon, 12 Sep 2022 11:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#57749: [patch] maven: fix build with java-slf4j-simple-source expanded Resent-From: "Dr. Arne Babenhauserheide" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 12 Sep 2022 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57749 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Julien Lepiller Cc: 57749@debbugs.gnu.org Received: via spool by 57749-submit@debbugs.gnu.org id=B57749.166299814811356 (code B ref 57749); Mon, 12 Sep 2022 15:56:02 +0000 Received: (at 57749) by debbugs.gnu.org; 12 Sep 2022 15:55:48 +0000 Received: from localhost ([127.0.0.1]:47641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXlmm-0002x6-El for submit@debbugs.gnu.org; Mon, 12 Sep 2022 11:55:48 -0400 Received: from mout.web.de ([217.72.192.78]:42029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXlmj-0002wr-UN for 57749@debbugs.gnu.org; Mon, 12 Sep 2022 11:55:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1662998138; bh=yCyzPbl7HTNC+z+365CCMnNG9t2KOob4nQgz8AVKKGE=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=ee9lfHhU0LtW9cUKZTivtiZ2JDIgp1d6VFPdxZuGREDbD/rAEu26aXCS7YDWdr1gi 9zfbd+6VU6tr5xbfig2kZxbZELipNOee5L6lKVoGby/CzETRqgt8JKGeScM4fKeakZ flKDBmAhSd6np0A7O3rFG7hNvfYU/kwMa7ze+nOk= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss ([84.153.137.18]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Mty5u-1pLL8A2NAK-00uU5X; Mon, 12 Sep 2022 17:55:38 +0200 References: <87sfkw3h4i.fsf@web.de> User-agent: mu4e 1.8.9; emacs 28.1 From: "Dr. Arne Babenhauserheide" Date: Mon, 12 Sep 2022 17:45:57 +0200 In-reply-to: Message-ID: <87o7vk37uv.fsf@web.de> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Provags-ID: V03:K1:7l/CrbE/2UBiwoCaXVeolSaNa4YZNTV2kjsIgeSAunij0sDF5qM F2Nx6ntTBLScLCwFGdlHvoDNMnVYL1Y2jVvNmgYYhzLH4u2Drwc5cQitMV+CjPYmCvXMeEC mRp+W33jugfPOeFVYDvXmssdfDweo5qnFP2qKo+4+OUN22iAZh300VTwc+t1YVyp4R9aJhF 833jsPMmSxEKTyzu4guLg== X-UI-Out-Filterresults: notjunk:1;V03:K0:EIngg5cQp8g=:+CNG7Z4HXK+p6NjVC1+9d7 +QIYfxgWn0gtDdDJfqZXoIA9xdlZotNeuREp7ekfkqZlR7WujO9r2s1tvoUQhTtVj8uOBJTG6 /dqAodasTjBDOYjGRw3GjI6Idts8oEdHPDYlx2Khrl/flsGqt4eHOApzDPP27SwOv/qyzfnwz vvkRndxArKc3jQOmfbvw/kqHLKB1A6vWv2TIglyQmhQ97E6d7znfFSpsLchBvr03aiVYBbltl RTXcaPhdwHgv51KriUaigNRlcfiHaTcxvLhCsHio5NMzM6CioQBcTg/bTVwe2irCOy90rPHRw jQzsTKAZcSEEepuGxDnn+Vo/hG0yVutRu56ld49TO4utcglykm76VDrGXBhs6BQSB5NoKVU0N ho8Q2y0N8iwutrjfYRih5QUmvNVPb8Z884Cp8NLzFyqrnYOeKxhuZzcZiu1L5kesGqV5fSX8/ EwF7wKZbBtaXDLGSmlOPbWuUlWkGmnFJepPAJFgIT0VSm4EIO7dNdI7uJSQggFJz8r1K2g70E tXY+Ucg+A7gZhfZD0cPxNmUxc2YDkY7TIBjYM+WwWdy9rt6B6YmyrKp9dYwProqnUVRZ7AGAj avdVmdcVxOXms3404VCNsbxUbFm54U1qfDlLmVapIr1ONrKgZFjzAcdeqQ9K19H5oyjtrSZQv BV8174/wu2ho9Zgz98YYLTbATjAf/n7lDigxWMk6DR5q2FXaVIt8VE1PlqVj3BxUotckX+j5b A2zkQlppkTHVUx6i68I1xCQCsj7ODxctu+3lea39a7Gza+7SIp+Jfe4S0oLmMrgr7iLkKYGpb ykzXqgaiaUDEy2psAOKb/1r8HJYkKYIR1OIC/8Cg73TZu+1VAlPrTMuU4fYGFPPzfaeB4nahI q0QlJ1Kt6j49Dj3nAEXpTRD5qJccU/XgRBwuPKeQOngsPhu6+B85/GX1ACEBJIDoo/0dDyjc5 0UvdwFhN3QF+Jy48K5DX0LNoYM8i2VVENHRtGnZ1uvbIX/T1iZQolWaPjV4/UiDa5LjeKSF4o NZhzyQzgqlJK4sUo2Mgfnj9floSFMGsDumC6F+BIggNSFqhBOQ6qkfwtXMfSuPl7+mT6SuzNO XJlzojy6ofuyDyl6AeS8B260gAkyz2LyP9q8iJqwLcpi8R9gGmgSveIiEtLz4yMaEj27DM1YY wLpWpHpDEpGSo7DsehGw4dglwE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662998172; 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: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: dkim-signature; bh=4ujk51ZuW43+7amhOTsNyv+ybZgOB02pa6HdI+DSZkU=; b=GN80Yk8P/SQjbnPOuJlZNdcKd2JV2kArKFyXpq7eGKpSQYi0Xm5xRwjumV3eNi9B2HkyXj n/jGB2MoAll0qTptixaKwp7bXqTlFB84A8Jr23SeLSGNlpntS4AB6dss6TONXO2/knavfw fOBqCxYBYOha4sWWzgqAfqcDv9/NKgVGdyO+kF4XNaVbj2jR+eP5728AISSUfeyV8dCUhm Zj1E8lfuqoHtNB4BRuM9Bm+agbkgfEWh/S5hCufxKEt2vGYYxZFTJ2o5Yg5GXODEvRlES4 hqUdusASlt1uAtFR5RKOqNshnoJg1XjoxGYjd8cJKD4Z4+cnlMu/OYcp0ZCidg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662998172; a=rsa-sha256; cv=none; b=fRVMrCM9kmKhHTAVsWbE/DY6XM6nQK6//jsEvdX386t7SYUmD3RP3pVsv5jxhuWRHK3eiz Y5mF69qQ74xvz01Xq3Qtw2auzXlMF9Pz7K3e42X1Ac7j1gvY1hk4MhSO0e6e0CrNbqEMaR udzZLLcpTI4+KD+cIhKoDhrCOlTLcStFjv6FONe65szOsa/28QH7da1L+jm1iDpwp7NPsq GKjbcNAiBIfZ+T6qW3vnTm2eJhOH3pBw1T+L3pfhfbMwOw/YYLJxyOyZK1WDTlIgc7jvyO hSMMMwGqVlmrPMc48Bu3xtnVdY1VuZNRCIfpDBU+LBNpRMwFnefkGdVmJPaAwg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=dbaedf251592 header.b=ee9lfHhU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=web.de (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.29 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=dbaedf251592 header.b=ee9lfHhU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=web.de (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4272DABE2 X-Spam-Score: 4.29 X-Migadu-Scanner: scn0.migadu.com X-TUID: I0L5PYd/L/P0 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Julien Lepiller writes: > I don't think checking for file-exists before mkdir-p makes much sense. D= oesn't mkdir-p make the same > checks already? You=E2=80=99re right =E2=80=94 thank you! > I thought find-files required two arguments? Also the first argument > could be simplified to input-folder The second argument is #:optional. But yes, it should be input-folder =E2= =80=94 that was the whole point of the first let. Thank you! > Otherwise LGTM, but I can't push myself currently. Thanks! Here=E2=80=99s the updated patch: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-maven-fix-build-with-java-slf4j-simple-source-ex.patch Content-Transfer-Encoding: quoted-printable From=2012164a5b46ad0a5c27c42b426ad94df8f9910b48 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Mon, 12 Sep 2022 14:31:42 +0200 Subject: [PATCH] gnu: maven: fix build with java-slf4j-simple-source expand= ed * gnu/packages/maven.scm (maven): copy files from source. =2D-- gnu/packages/maven.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 28ec4eb9a8..f198c2a475 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; Copyright =C2=A9 2020 Efraim Flashner ;;; Copyright =C2=A9 2022 Artyom V. Poptsov +;;; Copyright =C2=A9 2022 Arne Babenhauserheide ;;; ;;; This file is part of GNU Guix. ;;; @@ -1787,7 +1788,16 @@ (define-public maven-slf4j-provider (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "generated-sources") (with-directory-excursion "generated-sources" =2D (invoke "tar" "xf" (assoc-ref inputs "java-slf4j-simple-s= ource")) + (let ((input-folder (assoc-ref inputs "java-slf4j-simple-so= urce"))) + ;; copy all files + (for-each (lambda (filename) + (let ((target ;; remove folder prefix plus sl= ash + (string-drop + filename + (1+ (string-length input-folder))))) + (mkdir-p (dirname target)) + (copy-file filename target))) + (find-files input-folder))) (for-each delete-file (find-files "." "StaticLoggerBinder.j= ava"))) (for-each (lambda (simple) =2D-=20 2.37.3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Best wishes, Arne =2D-=20 Unpolitisch sein hei=C3=9Ft politisch sein, ohne es zu merken. draketo.de --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmMfVnkQHGFybmVfYmFi QHdlYi5kZQAKCRAT741FJAPD68OHEAC0pLcYfyXQMPTRQ+FQ2ssmMNsaiUwyac8Z cxUAmR33pYRUp1CPbWQEwR6PjizAEMBLXPsqxmq8+jse6e3u25TzmR1NiKoqjU+y fTzYlaMJ8UnPjClng2NF6C7DJ8oKX0WnUXgLhKNdJ6u9He/uB+cUcd095vlZJCkY VH99grSpA8U+Tum7F7b1x39OfWFMEe6OXHirfM7y86XmIxvYjNBMXv0LL8J1D5mi DTCT2gJaRcHsV0nKWQVY7zqdt5Tag5kOfYJ3CqghYCFrY2W/q4mIbRB9hWpWNMij NZ9zMmULKQxrMI85qtmfBXWehGM9ZGw+VajKuC+GomVTWgWmpLUZ8DVi5dAabuxE hJSlx4C+6oNxMhrQoeCF+pvKBY20WMpVMMeoQmoC0bgbFh4sHDjRQx94RCT82TcK oSTua8B6u0haFr51RH5NEUFgt8C3hXxLlpzpTgROs2OEuwktR6reNWDoGq3voxyp xqyyyrjjOhwc2wPJH86p1jcWcIGCpAWuhBhEhyXw3ZIxfMEIuMEgimCDGW2PZtPh odoJUCmfS7bvp6HLhF5WQTmZdgt/BXGj9KimXqsWrrjLoJYptmgjUMciFpLeY4OG /H/Av2L+wOKo+wNTxZ+wGZXNT+q5WExvooHSXw0DpOxqniWhIXfZHKZm9cPDSUc8 SWvkL74lmojEBAEBCAAuFiEE3Si95tmHXKvOSosd3M8NswvBBUgFAmMfVnkQHGFy bmVfYmFiQHdlYi5kZQAKCRDczw2zC8EFSOQzA/9XiFDPmOBcSeH5eHoyYxmoHl+j tfX+klFgm68CKPiX9gDnq2oCepp4+O62UDMgf3PU7iNYAApWBmM3Lq1pRj7pqNxa 1rY653CH5EW9BlJxq0xa+DT7yAEp9haUpm4LK12nlfDg0+7tH7mMtmgdTxcHYmZj nMNI+bGKWz5+pUXUsQ== =LcLc -----END PGP SIGNATURE----- --==-=-=--