From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IG+LHJh6pGRPhQAASxT56A (envelope-from ) for ; Tue, 04 Jul 2023 22:01:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CKptHJh6pGSghAEAauVa8A (envelope-from ) for ; Tue, 04 Jul 2023 22:01:28 +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 1CCA13E3D0 for ; Tue, 4 Jul 2023 22:01:28 +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-Seal: i=1; s=key1; d=yhetil.org; t=1688500888; a=rsa-sha256; cv=none; b=Kv/wxksqol/UM/xdk1rKmEur3lH8RbDeR12qL1boqspRTW/QljGnrOvq9X0ZY1Hufta9/c IuqNTx9mfw1LLiQLLhxQUQnT9K8ziPGSTOd2pav5edeu1Ti7icHw5vx7n6SPslkAinLW9b ecNrpLM+9Q48Ae/vhGq0Cy4Vo6cx1TpqLbMrL5mMv9aT6L4B5H33S9RtVwQ4YHngWLMclE fbOd2w/u/e6ENmFQwM0TB3SH92H0JpLn1KqpV0YEmLM1Z9Ugrl5tGz4NutbOvJf3Z7zxrs +/uOCvkFPeZ4RxvNBbOwBmXMNrFRhGMH6QWGGqPYCt+g8/bkNvoq3xXrRD5JxQ== 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688500888; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=oi8IT7H1mGk7ZRleAUhaACb3KRtOhfTXgqw0xcQEUQM=; b=E/8x7WRHtspkBHVz7E80t6RTidALuPIs1qR/OUQvkevdAWXMwwWoanOVNhSid9up3mJ2f3 klGl3lN2To45feBPA/ChF0kB0SXhyNeSLJZ7yYGk4dWWIX+IJTuaGaTHcfzbFUS+AsxTel gXZIjGNK6xdi4JOB7j103swfcxujxmIpUNHeTiYMNhObOmmOAO290DcE3zMmd9trPwjo1e V+l5hQtGiMmxxiznLw6a0Uew5BUDq5oMr3/TNS0V8xW9ALB+6jac7QWrCWy9sbF2+Yt2G1 XzbbMPsplxxNrkdlGVffs2+zO4W+NDDD6XMuqMbun13G3as0lgOEeIt94LPJ3w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD5-0002ym-Go; Tue, 04 Jul 2023 16:01:15 -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 1qGmCw-0002vN-Pw for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGmCt-0004WO-FR for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGmCt-0000Ua-BC for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 5/7] Revert "gnu: maven-model-builder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008251780 (code B ref 64466); Tue, 04 Jul 2023 20:01:03 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:25 +0000 Received: from localhost ([127.0.0.1]:36660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCH-0000Se-JT for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:25 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCG-0000SW-1Q for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:24 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 18479209B9 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6C8FE8009A; Tue, 4 Jul 2023 22:00:16 +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 POPsAYwvQ0uD; Tue, 4 Jul 2023 22:00:15 +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 AFA778009B; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:51 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.76 X-Migadu-Queue-Id: 1CCA13E3D0 X-Spam-Score: -1.76 X-TUID: KeYWDXwFAlyN This reverts commit 04f9ac0cfaf86f9e590e0fdc62855d9c87245104. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e6cb02c744..5bbf37377f 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1410,10 +1410,6 @@ (define-public maven-model-builder (copy-recursively "src/main/resources" "build/classes") #t)) - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.40.1